1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-01-24 05:26:33 +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-04-13 16:42:09 +02:00
2019-04-13 16:42:09 +02:00
2016-07-09 16:54:13 +08:00
2019-03-10 08:31:10 +01:00
2019-03-08 20:44:45 -05:00