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)
Conflicts:
wolnelektury/static/css/base.css
wolnelektury/static/css/book_box.css
wolnelektury/templates/catalogue/book_short.html


No differences found