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

 from flask import Blueprint, request, flash, redirect, url_for
-from cps import ub, searched_ids
+from cps import ub, searched_ids, app, db
 from flask_babel import gettext as _
 from sqlalchemy.sql.expression import func, or_
 from flask_login import login_required, current_user
 from web import render_title_template
-from cps import app
-import db

 shelf = Blueprint('shelf', __name__)