Merge branch 'reflow'
authorJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 08:55:02 +0000 (09:55 +0100)
committerJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 08:55:02 +0000 (09:55 +0100)
commitae60b2a3949e96357477cc04f90fd0873cee8a92
tree39b1f19820dd01f8d412ff94e8fcf6d9f454a09d
parent82c3054bcdeb000aa9782da80d644070797b5cbe
parent5e463c73f3f1356eebc8f4607381538d4565ff62
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
apps/catalogue/templates/catalogue/menu.html