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

Conflicts:
	endpoints/api.py
This commit is contained in:
jakedt 2014-03-25 15:50:03 -04:00
commit 5f98bf8dab
5 changed files with 23 additions and 11 deletions

View file

@ -1,10 +1,7 @@
<!-- Quay -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="fa-bar"></span>
<span class="fa-bar"></span>
<span class="fa-bar"></span>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse" style="padding: 0px; padding-left: 4px; padding-right: 4px;">
<span style="font-size: 24px">&equiv;</span>
</button>
<a class="navbar-brand" href="/" target="{{ appLinkTarget() }}">
<img src="/static/img/quay-logo.png">