From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Thu, 19 Jan 2012 14:46:10 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/276656dcc680e1a35103d310dea046152ddc3785?ds=sidebyside;hp=276656dcc680e1a35103d310dea046152ddc3785

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

Conflicts:
	wolnelektury/static/css/book_box.css
	wolnelektury/templates/catalogue/book_wide.html
---