Merge branch 'preview'
authorJan Szejko <janek37@gmail.com>
Tue, 5 Jun 2018 14:46:14 +0000 (16:46 +0200)
committerJan Szejko <janek37@gmail.com>
Tue, 5 Jun 2018 15:11:50 +0000 (17:11 +0200)
commit73b6a1639ba8f9f5fc7615c136364fdba73e5bb2
tree1898d396b2a703ca70487b18f9daf9dbc8660e42
parentcbf4353403bf60dd0966e060a78893685080ae0b
parent0543785bb9e74989036d99eb25cf23c3ef82cdf7
Merge branch 'preview'

# Conflicts:
# src/api/handlers.py
# src/catalogue/models/book.py
# src/catalogue/templates/catalogue/book_short.html
src/ajaxable/utils.py
src/api/handlers.py
src/catalogue/migrations/0025_merge.py
src/catalogue/models/book.py
src/catalogue/templates/catalogue/book_short.html
src/wolnelektury/urls.py
src/wolnelektury/views.py