Merge branch 'master' into cover_thumbnail

# Conflicts: # cps/editbooks.py # cps/helper.py # cps/web.py # test/Calibre-Web TestSummary_Linux.html
2022-03-14 19:41:47 +01:00
parent 8f665ebd58 8f3bb2e338
commit d9a83e0638
48 changed files with 1053 additions and 1047 deletions
@@ -35,6 +35,8 @@ from cps.ub import init_db_thread

 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
+
+
 log = logger.create()