Martyn Inglis 8b9319ac7a Merge branch 'master' into scheduled-delivery-of-jobs ...

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

2016-08-25 14:53:00 +01:00

..

app

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

2016-08-25 14:53:00 +01:00

__init__.py

…

conftest.py

Added job_status to marshmallow

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