Rebecca Law 4f6a66c904 Merge branch 'master' into update-job-status ...

Conflicts:
	app/dao/jobs_dao.py
	tests/app/dao/test_jobs_dao.py

2017-04-06 11:11:37 +01:00

..

test_provider_tasks.py

Update as per comments on review

2017-02-06 16:20:44 +00:00

test_research_mode_tasks.py

Changed the body of the request to use the right phone number, the phone number is not currently used in the callback logic but if it was then this may cause a problem.

2017-01-23 10:43:33 +00:00

test_scheduled_tasks.py

Good spot by Leo on has_calls not being exclusive,

2017-04-05 16:50:32 +01:00

test_tasks.py

Merge branch 'master' into update-job-status

2017-04-06 11:11:37 +01:00