fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 263e2a7 e432f85)
Merge branch 'master' of http://github.com/fnp/wolnelektury
authorLukasz <lukasz@anwajler.com>
Tue, 11 May 2010 07:33:43 +0000 (09:33 +0200)
committerLukasz <lukasz@anwajler.com>
Tue, 11 May 2010 07:33:43 +0000 (09:33 +0200)
1  2 
wolnelektury/settings.py patch | diff1 | diff2 | blob | history
wolnelektury/templates/catalogue/tagged_object_list.html patch | diff1 | diff2 | blob | history

diff --cc wolnelektury/settings.py
Simple merge