fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d316a52 a4be8e3)
Merge branch 'lucene_memory'
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 11 Apr 2012 09:24:59 +0000 (11:24 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 11 Apr 2012 09:24:59 +0000 (11:24 +0200)
1  2 
wolnelektury/settings/__init__.py patch | diff1 | diff2 | blob | history

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