1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-02-03 13:21:21 +02:00
Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py
2019-04-13 16:42:09 +02:00
..
2019-01-14 20:27:53 +01:00
2018-08-27 22:08:55 +02:00