Martyn Inglis b4d40dcd18 Merge branch 'master' into write-to-postgres-not-sqs ...

Conflicts:
	app/notifications/rest.py
	tests/app/notifications/rest/test_send_notification.py

2016-09-08 09:15:07 +01:00

..

authentication

…

celery

Fix issue where test key cannot send messages to external numbers

2016-09-07 09:57:20 +01:00

clients

…

dao

Merge pull request #656 from alphagov/add-cancel-job-endpoint

2016-09-06 12:11:32 +01:00

events

…

invite

…

job

Merge pull request #656 from alphagov/add-cancel-job-endpoint

2016-09-06 12:11:32 +01:00

notifications

Merge branch 'master' into write-to-postgres-not-sqs

2016-09-08 09:15:07 +01:00

organisation

…

provider_details

…

public_contracts

Fix mocker syntax issue

2016-09-07 11:17:27 +01:00

service

…

spec

…

status

…

template

…

template_statistics

…

user

…

__init__.py

…

conftest.py

Merge pull request #656 from alphagov/add-cancel-job-endpoint

2016-09-06 12:11:32 +01:00

test_encryption.py

…

test_model.py

Adds a builder method to the notification object.

2016-09-07 13:44:56 +01:00

test_schemas.py

…

test_statsd_decorators.py

replace mock with unittest.mock

2016-08-31 12:39:11 +01:00