Merge branch 'dev'
authorJan Szejko <jan.szejko@gmail.com>
Wed, 13 Apr 2016 08:17:15 +0000 (10:17 +0200)
committerJan Szejko <jan.szejko@gmail.com>
Wed, 13 Apr 2016 08:50:34 +0000 (10:50 +0200)
commit9a938c8b406ce05e3bca4a5a483d473ece9e17b0
tree24ea220a66b6caf7273dcf3a035a7fc05e710f50
parented79e41001ebd01207fcea50e09aea5ebcae8a0d
parenta23b57cb16a06a83d745961503daac8c4d99b526
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
12 files changed:
src/api/management/commands/mobileinit.py
src/catalogue/helpers.py
src/catalogue/models/book.py
src/catalogue/templates/catalogue/inline_tag_list.html
src/catalogue/templatetags/catalogue_tags.py
src/catalogue/views.py
src/picture/models.py
src/picture/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