Ozzie Isaacs 2e815147fb Merge branch 'master' into Develop
# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html
2021-12-19 10:29:56 +01:00
..
2021-12-05 18:48:21 +01:00
2021-07-30 09:25:19 +02:00
2021-11-30 22:25:45 -06:00
2021-10-03 09:32:29 +02:00
2021-08-07 20:51:10 +08:00
2021-10-03 09:31:24 +02:00
2021-10-06 22:06:33 +02:00
2021-12-05 13:09:41 +01:00
2021-10-06 22:06:33 +02:00
2020-12-11 20:55:09 +01:00