From: Jan Szejko <janek37@gmail.com>
Date: Tue, 5 Jun 2018 14:46:14 +0000 (+0200)
Subject: Merge branch 'preview'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/73b6a1639ba8f9f5fc7615c136364fdba73e5bb2?hp=73b6a1639ba8f9f5fc7615c136364fdba73e5bb2

Merge branch 'preview'

# Conflicts:
#	src/api/handlers.py
#	src/catalogue/models/book.py
#	src/catalogue/templates/catalogue/book_short.html
---