fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e353262 01d7c5f)
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 16:44:44 +0000 (17:44 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 16:44:44 +0000 (17:44 +0100)
Conflicts:
wolnelektury/templates/catalogue/book_searched.html

1  2 
apps/search/index.py patch | diff1 | diff2 | blob | history

diff --cc apps/search/index.py
Simple merge