merge wyszukiwania.
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 28 Dec 2011 09:14:23 +0000 (10:14 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 28 Dec 2011 09:14:23 +0000 (10:14 +0100)
commit9fbf0c4158a9427442171629a564e2de7780b5b7
tree79516c7f7976f70cd1dc6a47251944321bba9c79
parentafdd9bc42c8e08e0e2fbade6b9c934a3d65f4885
parent76fc2ed0abc7ff4bb7ddee798a115f11bf51ee1c
merge wyszukiwania.

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
lib/librarian
wolnelektury/templates/base.html
apps/catalogue/models.py
apps/catalogue/urls.py
wolnelektury/settings.py
wolnelektury/static/js/search.js
wolnelektury/templates/base.html
wolnelektury/urls.py