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
2014-02-06 21:23:27 -05:00 · 2014-02-06 21:23:27 -05:00 · 98e57b9d2b
commit 98e57b9d2b
parent fa1bf94af1 b9a5e355eb
19 changed files with 1615 additions and 66 deletions
--- a/application.py
+++ b/application.py
@ -4,7 +4,6 @@ import os
 from app import app as application
 from data.model import db as model_db

-
 # Initialize logging
 application.config['LOGGING_CONFIG']()