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

Changed the delay period. Now waits

2016-06-17 16:32:56 +01:00

test_research_mode_tasks.py

fix firetext research mode requests

2016-06-09 15:15:44 +01:00

test_scheduled_tasks.py

Move scheduled tasks into their own module.

2016-06-20 13:33:53 +01:00

test_tasks.py

Merge branch 'master' into move-scheduler-tasks

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