Rebecca Law 6c81d0f465 Merge branch 'master' into move-scheduler-tasks ...

Conflicts:
	tests/app/celery/test_tasks.py

2016-06-21 11:24:26 +01:00

..

test_provider_tasks.py

…

test_research_mode_tasks.py

…

test_scheduled_tasks.py

…

test_tasks.py

…