fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 735368c)
Merge branch 'master' of http://github.com/fnp/wolnelektury
authorLukasz <lukasz@anwajler.com>
Tue, 18 May 2010 08:30:32 +0000 (10:30 +0200)
committerLukasz <lukasz@anwajler.com>
Tue, 18 May 2010 08:30:32 +0000 (10:30 +0200)
Conflicts:
wolnelektury/settings.py
wolnelektury/templates/catalogue/book_stub_detail.html
wolnelektury/templates/catalogue/search_no_hits.html
wolnelektury/templates/catalogue/tagged_object_list.html


No differences found