Rebecca Law 96b0e42959 Merge branch 'master' into schedule-api-notification ...

Conflicts:
	app/celery/scheduled_tasks.py
	tests/app/celery/test_scheduled_tasks.py

2017-05-24 13:21:22 +01:00

..

__init__.py

…

celery.py

…

provider_tasks.py

…

research_mode_tasks.py

…

scheduled_tasks.py

Merge branch 'master' into schedule-api-notification

2017-05-24 13:21:22 +01:00

statistics_tasks.py

Renamed method.

2017-05-12 12:19:56 +01:00

tasks.py

General refactor

2017-05-22 10:12:18 +01:00