merge player changes and detail page + search
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 29 Dec 2011 16:17:54 +0000 (17:17 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 29 Dec 2011 16:17:54 +0000 (17:17 +0100)
commit075fb07f19c2f20cd3b6818b973e7aebebdacc9f
treeba6b1b75f3da43b069fc1dbd3a9d84c7beb3656c
parent27645bc61a8cb186116d6410217011dd755823f2
parent4b6fc6dc545a10955094bfaa9448ba070cfb33bf
merge player changes and detail page + search

Conflicts:
wolnelektury/static/css/base.css
wolnelektury/static/css/book_box.css
wolnelektury/templates/catalogue/book_short.html
apps/catalogue/models.py
apps/catalogue/urls.py
wolnelektury/settings.py
wolnelektury/static/css/base.css
wolnelektury/static/css/book_box.css
wolnelektury/static/css/header.css
wolnelektury/templates/catalogue/book_short.html
wolnelektury/urls.py