Martyn Inglis cf3c14dbbd Added job_status to marshmallow ...

- ensured statues not deleted on test runs
- returns in API call

Merge branch 'add-new-column-to-jobs-for-delayed-sending' into scheduled-delivery-of-jobs

Conflicts:
	app/models.py

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

..

app

Added job_status to marshmallow

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

__init__.py

only send to team emails/phones if POST /notificaiton/<type> with team api_key

2016-07-01 14:33:25 +01:00

conftest.py

Added job_status to marshmallow

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