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
parent 42bf40d7bb 592288cb22
commit 2e815147fb
57 changed files with 3302 additions and 2981 deletions
@@ -85,7 +85,7 @@ class WorkerThread(threading.Thread):
    def add(cls, user, task):
        ins = cls.getInstance()
        ins.num += 1
-        log.debug("Add Task for user: {}: {}".format(user, task))
+        log.debug("Add Task for user: {} - {}".format(user, task))
        ins.queue.put(QueuedTask(
            num=ins.num,
            user=user,