Martyn Inglis 1ad2665bfe Merge branch 'master' into remove-code-that-handled-old-new-job-api ...

Conflicts:
	app/main/views/jobs.py
	app/notify_client/job_api_client.py

2016-09-05 14:29:58 +01:00

..

__init__.py

delete template button POSTs archived:true

2016-05-23 15:04:24 +01:00

test_events_client.py

make test folder structure align with app folder structure

2016-07-15 15:23:40 +01:00

test_invite_client.py

make test folder structure align with app folder structure

2016-07-15 15:23:40 +01:00

test_job_client.py

Merge branch 'master' into remove-code-that-handled-old-new-job-api

2016-09-05 14:29:58 +01:00

test_notification_client.py

make test folder structure align with app folder structure

2016-07-15 15:23:40 +01:00

test_service_api_client.py

Make _attach_current_user a pure function

2016-08-11 17:07:55 +01:00

test_template_statistics_client.py

make test folder structure align with app folder structure

2016-07-15 15:23:40 +01:00

test_user_client.py

make test folder structure align with app folder structure

2016-07-15 15:23:40 +01:00