Merge branch 'master' into celery-spike

Conflicts:
	app/__init__.py
	app/notifications/rest.py
	config.py
	wsgi.py
This commit is contained in:
Martyn Inglis
2016-02-12 09:36:49 +00:00
26 changed files with 896 additions and 429 deletions

View File

@@ -15,7 +15,3 @@ class NotifyCelery(Celery):
with app.app_context():
return TaskBase.__call__(self, *args, **kwargs)
self.Task = ContextTask