Martyn Inglis 838bf1d7d4 Merge branch 'master' into split-sms-and-retry ...

Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py

2016-06-17 16:39:03 +01:00

..

__init__.py

…

celery.py

…

provider_tasks.py

Changed the delay period. Now waits

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

research_mode_tasks.py

fix firetext research mode requests

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

tasks.py

Merge branch 'master' into split-sms-and-retry

2016-06-17 16:39:03 +01:00