Merge branch 'master' into Develop

# Conflicts: # cps/templates/layout.html
2020-06-28 12:11:46 +02:00
parent 59b78f9984 ba10657829
commit ccca5d4d1c
45 changed files with 3936 additions and 3742 deletions
@@ -5,7 +5,7 @@
    {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}</a>
  </p>
  <p>
-    {% if not warning %}'api_endpoint='{{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
+    {% if not warning %}api_endpoint={{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
  </p>
  <p>
 </div>