Merge branch 'master' into tutorial

Conflicts:
	static/directives/header-bar.html
This commit is contained in:
jakedt 2014-02-13 16:54:02 -05:00
commit 8135e0266e
4 changed files with 3 additions and 4 deletions

View file

@ -15,7 +15,7 @@
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<li><a ng-href="/repository/" target="{{ appLinkTarget() }}">Repositories</a></li>
<li><a href="http://docs.quay.io/">Documentation</a></li>
<li><a href="http://docs.quay.io/" target="_blank">Documentation</a></li>
<li><a ng-href="/tutorial/" target="{{ appLinkTarget() }}">Tutorial</a></li>
<li><a ng-href="/plans/" target="{{ appLinkTarget() }}">Pricing</a></li>
<li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li>