From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 29 Dec 2011 16:17:54 +0000 (+0100)
Subject: merge player changes and detail page + search
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/075fb07f19c2f20cd3b6818b973e7aebebdacc9f?hp=075fb07f19c2f20cd3b6818b973e7aebebdacc9f

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
---