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
@@ -22,12 +22,11 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.

 # opds routing functions
-from cps import config, mimetypes, app
+from cps import config, mimetypes, app, db
 from flask import request, render_template, Response, g, make_response
 from pagination import Pagination
 from flask import Blueprint
 import datetime
-import db
 import ub
 from flask_login import current_user
 from functools import wraps