Rebecca Law 8f3e8181fe Merge branch 'master' into scheduled-delivery-of-jobs-cleanup ...

Conflicts:
	tests/app/job/test_rest.py

2016-09-02 11:03:21 +01:00

..

app

Merge branch 'master' into scheduled-delivery-of-jobs-cleanup

2016-09-02 11:03:21 +01:00

__init__.py

…

conftest.py

Added job_status to marshmallow

2016-08-24 14:35:22 +01:00