From: Jan Szejko <j-sz@o2.pl>
Date: Mon, 1 Feb 2016 08:55:02 +0000 (+0100)
Subject: Merge branch 'reflow'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92?ds=sidebyside;hp=ae60b2a3949e96357477cc04f90fd0873cee8a92

Merge branch 'reflow'

Conflicts:
	apps/catalogue/templates/catalogue/menu.html
	src/catalogue/management/commands/importbooks.py
	src/catalogue/templatetags/catalogue_tags.py
	src/catalogue/urls.py
	wolnelektury/settings/static.py
---