Merge branch 'bobthe'

Conflicts:
	test/data/test.db
This commit is contained in:
yackob03 2014-02-13 12:47:59 -05:00
commit 8f6cdabde3
41 changed files with 1519 additions and 744 deletions

View file

@ -1,5 +1,4 @@
import logging
import os
from app import app as application
from data.model import db as model_db
@ -20,10 +19,6 @@ from endpoints.webhooks import webhooks
logger = logging.getLogger(__name__)
if application.config.get('INCLUDE_TEST_ENDPOINTS', False):
logger.debug('Loading test endpoints.')
import endpoints.test
application.register_blueprint(web)
application.register_blueprint(index, url_prefix='/v1')
application.register_blueprint(tags, url_prefix='/v1')