Merge remote-tracking branch 'github/patch-1' into Develop

Oauth is optional again
2019-02-24 19:34:57 +01:00
parent 1de3929988 38307ececb
commit eef4787b79
7 changed files with 13 additions and 13 deletions
@@ -26,7 +26,7 @@ from cps import config, language_table, get_locale, app, ub, global_WorkerThread
 from flask import request, flash, redirect, url_for, abort, Markup, Response
 from flask import Blueprint
 import datetime
-import db
+from cps import db
 import os
 import json
 from flask_babel import gettext as _