1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-12-12 19:28:06 +00:00

Merge branch 'master' into Develop

# Conflicts:
#	cps.py
#	cps/web.py
This commit is contained in:
Ozzie Isaacs
2021-08-27 16:16:24 +02:00
15 changed files with 86 additions and 54 deletions

1
cps.py
View File

@@ -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: