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

..

app

Merge branch 'master' into update-job-status

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

__init__.py

…

conftest.py

Add tests to verify correctness of the switching provider task

2017-02-24 12:23:39 +00:00