Merge remote-tracking branch 'origin/touchdown'

Conflicts:
	static/css/quay.css
	static/js/controllers.js
	test/data/test.db
This commit is contained in:
Jake Moshenko 2014-07-07 15:33:51 -04:00
commit c338b7d621
33 changed files with 1296 additions and 242 deletions

View file

@ -67,6 +67,13 @@ def guide():
return index('')
@web.route('/tour/')
@web.route('/tour/<path:path>')
@no_cache
def tour(path = ''):
return index('')
@web.route('/tutorial/')
@no_cache
def tutorial():