Merge branch 'master' into Develop

# Conflicts: # cps/admin.py # cps/config_sql.py # cps/search.py # cps/templates/admin.html # cps/web.py # setup.cfg # test/Calibre-Web TestSummary_Linux.html
2023-01-28 18:52:50 +01:00
parent 2472e03a69 9701a97a57
commit 508e2b4d0a
307 changed files with 118181 additions and 72192 deletions
@@ -113,7 +113,7 @@ def generate_auth_token(user_id):

    return render_title_template(
        "generate_kobo_auth_url.html",
-        title=_(u"Kobo Setup"),
+        title=_("Kobo Setup"),
        auth_token=auth_token.auth_token,
        warning = warning
    )