fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64937dc 82cef4d)
Merge branch 'master' of https://github.com/fnp/wolnelektury
authorMarcin Koziej <marcin@lolownia.org>
Thu, 12 Apr 2012 09:06:08 +0000 (11:06 +0200)
committerMarcin Koziej <marcin@lolownia.org>
Thu, 12 Apr 2012 09:06:08 +0000 (11:06 +0200)
1  2 
wolnelektury/settings/__init__.py patch | diff1 | diff2 | blob | history

diff --cc wolnelektury/settings/__init__.py
Simple merge