Merge branch 'master' into celery-jobs

This commit is contained in:
Martyn Inglis
2016-02-25 12:06:53 +00:00
15 changed files with 328 additions and 2 deletions

View File

@@ -46,6 +46,7 @@ def create_app():
from app.status.healthcheck import status as status_blueprint
from app.job.rest import job as job_blueprint
from app.notifications.rest import notifications as notifications_blueprint
from app.invite.rest import invite as invite_blueprint
application.register_blueprint(service_blueprint, url_prefix='/service')
application.register_blueprint(user_blueprint, url_prefix='/user')
@@ -53,6 +54,7 @@ def create_app():
application.register_blueprint(status_blueprint, url_prefix='/status')
application.register_blueprint(notifications_blueprint)
application.register_blueprint(job_blueprint)
application.register_blueprint(invite_blueprint)
return application