Merge branch 'master' into patch1

pull/102/head
OzzieIsaacs 8 years ago
commit 0967b03a22

@ -426,6 +426,7 @@ def feed_osd():
return response return response
@app.route("/opds/search/<query>") @app.route("/opds/search/<query>")
@requires_basic_auth_if_no_ano
def feed_cc_search(query): def feed_cc_search(query):
return feed_search(query.strip()) return feed_search(query.strip())
@ -956,6 +957,7 @@ def stats():
@app.route("/shutdown") @app.route("/shutdown")
@login_required
def shutdown(): def shutdown():
# logout_user() # logout_user()
# add restart command to queue # add restart command to queue

Loading…
Cancel
Save