Merge branch 'master' into platform-admin

Conflicts: tests/app/main/views/test_dashboard.py
2026-08-25 00:33:58 -04:00 · 2016-03-21 13:23:46 +00:00
parent a1ef676fab 304b411bd5
commit 8ab4a5b150
10 changed files with 79 additions and 23 deletions
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -22,7 +22,6 @@
  {% if current_user.has_permissions(['manage_api_keys', 'access_developer_docs']) %}
  <ul>
    <li><a href="{{ url_for('.api_keys', service_id=service_id) }}">API keys</a></li>
-    <li><a href="{{ url_for('.documentation', service_id=service_id) }}">Developer documentation</a></li>
  </ul>
  {% endif %}