Merge branch 'master' into tutorial
Conflicts: endpoints/index.py static/css/quay.css static/js/app.js static/js/controllers.js test/data/test.db
This commit is contained in:
commit
98e57b9d2b
19 changed files with 1615 additions and 66 deletions
|
@ -117,10 +117,11 @@ var isProd = document.location.hostname === 'quay.io';
|
|||
<ul>
|
||||
<li><span class="copyright">©2014 DevTable, LLC</span></li>
|
||||
<li><a href="http://blog.devtable.com/">Blog</a></li>
|
||||
<li><a href="/tos" target="_self">Terms of Service</a></li>
|
||||
<li><a href="/privacy" target="_self">Privacy Policy</a></li>
|
||||
<li><a href="/tos" target="_self">Terms</a></li>
|
||||
<li><a href="/privacy" target="_self">Privacy</a></li>
|
||||
<li><a href="/security/">Security</a></li>
|
||||
<li><b><a href="/contact/">Contact Us</a></b></li>
|
||||
<li><a href="/about/">About</a></li>
|
||||
<li><b><a href="/contact/">Contact</a></b></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
|
Reference in a new issue