Merge remote-tracking branch 'fix/kobo' into Develop

# Conflicts:
#	cps/db.py
#	cps/web.py
This commit is contained in:
Ozzieisaacs 2020-01-11 18:35:04 +01:00
commit 2798dd5916

View File

@ -810,9 +810,7 @@ def get_tasks_status():
@app.route("/reconnect")
def reconnect():
db.session.close()
db.engine.dispose()
db.setup_db(config)
db.reconnect_db(config)
return json.dumps({})
@web.route("/search", methods=["GET"])