Commit 2798dd59 authored by Ozzieisaacs's avatar Ozzieisaacs

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

# Conflicts:
#	cps/db.py
#	cps/web.py
parents 8143c16c 9ec3ddd4
......@@ -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"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment