Ozzie Isaacs f62d6abb69 Merge branch 'master' into development
# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html
2021-03-15 13:53:23 +01:00
..
2020-10-31 19:58:22 +01:00
2019-07-13 20:54:21 +02:00
2018-12-27 10:53:19 +01:00
2020-05-09 17:00:03 +02:00
2020-05-09 17:00:03 +02:00
2019-01-03 22:01:52 +01:00
2017-05-13 14:01:52 +02:00
2020-02-09 17:02:28 +01:00
2019-07-13 20:54:21 +02:00
2019-03-28 07:23:45 +02:00
2018-12-27 10:53:19 +01:00
2019-07-13 20:54:21 +02:00