Merge branch 'master' into Develop

# Conflicts: # cps.py # cps/web.py
2021-08-27 16:16:24 +02:00
parent a35c635987 7ae3255ea9
commit 3946ef8f0d
15 changed files with 86 additions and 54 deletions
--- a/cps.py
+++ b/cps.py
@@ -72,7 +72,6 @@ def main():
    app.register_blueprint(admi)
    app.register_blueprint(remotelogin)
    app.register_blueprint(meta)
-    # if config.config_use_google_drive:
    app.register_blueprint(gdrive)
    app.register_blueprint(editbook)
    if kobo_available: