Merge remote-tracking branch 'origin/master' into api_service_permissions

This commit is contained in:
Nicholas Staples
2016-03-18 14:43:10 +00:00
14 changed files with 428 additions and 23 deletions

View File

@@ -25,4 +25,8 @@
<li><a href="{{ url_for('.documentation', service_id=service_id) }}">Developer documentation</a></li>
</ul>
{% endif %}
<ul>
<li><a href="{{ url_for('.view_notifications', service_id=service_id) }}">Notification history</a></li>
<li><a href="{{ url_for('.view_jobs', service_id=service_id) }}">Job history</a><li>
</ul>
</nav>