Merge remote-tracking branch 'original/Develop' into kobo_book_delete

2020-02-17 14:49:42 -05:00
parent f9dbc6bc78 050feed5dc
commit 7d99e21d0d
122 changed files with 12673 additions and 10007 deletions
@@ -41,3 +41,4 @@ try:
 except ImportError as err:
    log.debug("cannot import SyncToken, syncing books with Kobo Devices will not work: %s", err)
    kobo = None
+    SyncToken = None