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

..

__init__.py

…

celery.py

Merge branch 'master' into celery-spike

2016-02-12 09:36:49 +00:00

provider_tasks.py

fix invalid logging

2016-12-19 17:13:10 +00:00

research_mode_tasks.py

Bump timeout on research mode to match normal behaviour

2017-04-05 16:39:46 +01:00

scheduled_tasks.py

Updates to the delete CSV file job to reduce the number of eligible jobs in any run

2017-04-05 16:23:41 +01:00

tasks.py

Refactor if statement

2017-04-05 16:00:39 +01:00