Martyn Inglis e6347d99bd Merge branch 'master' into stats-db-updates ...

Conflicts:
	tests/app/conftest.py

2016-08-03 11:46:40 +01:00

..

app

Merge branch 'master' into stats-db-updates

2016-08-03 11:46:40 +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

'detailed' flag on GET /service/<uuid>

2016-07-21 14:04:25 +01:00