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
|
@ -94,6 +94,12 @@ def contact():
|
|||
return index('')
|
||||
|
||||
|
||||
@web.route('/about/')
|
||||
@no_cache
|
||||
def about():
|
||||
return index('')
|
||||
|
||||
|
||||
@web.route('/new/')
|
||||
@no_cache
|
||||
def new():
|
||||
|
|
Reference in a new issue