1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-02-06 06:00:06 +00: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
2018-12-27 10:53:19 +01:00
2019-03-28 07:23:45 +02:00
2019-01-03 22:01:52 +01:00
2019-03-28 07:23:45 +02:00
2017-05-13 14:01:52 +02:00
2019-03-03 07:37:15 +01:00
2019-03-28 07:23:45 +02:00
2018-12-27 10:53:19 +01:00