From: Jan Szejko <jan.szejko@gmail.com>
Date: Wed, 13 Apr 2016 08:17:15 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/9a938c8b406ce05e3bca4a5a483d473ece9e17b0?ds=sidebyside;hp=9a938c8b406ce05e3bca4a5a483d473ece9e17b0

Merge branch 'dev'

Conflicts:
	src/api/management/commands/mobileinit.py
	src/catalogue/templates/catalogue/inline_tag_list.html
	src/catalogue/templates/catalogue/plain_list.html
	src/catalogue/views.py
	src/wolnelektury/static/scss/main/book_box.scss
	src/wolnelektury/static/scss/main/header.scss
	src/wolnelektury/templates/main_page.html
	src/wolnelektury/templates/superbase.html
---