Rebecca Law 29ddad60e7 Merge branch 'master' into forgot-password ...

Conflicts:
	app/main/views/two_factor.py

2016-03-08 15:03:25 +00:00

..

__init__.py

…

api_client.py

Change put to post for service update.

2016-03-08 10:40:07 +00:00

api_key_api_client.py

notifications-python_client upgraded to 0.2.5

2016-02-11 15:27:08 +00:00

invite_api_client.py

[WIP] Add call to api to update invitation to accepted.

2016-03-03 18:13:56 +00:00

job_api_client.py

Merge branch 'master' into celery-jobs

2016-02-24 15:46:38 +00:00

models.py

Merge pull request #231 from alphagov/add_manage_service_permission

2016-03-04 11:07:34 +00:00

notification_api_client.py

Add API client for notifications

2016-03-03 11:15:50 +00:00

sender.py

…

status_api_client.py

notifications-python_client upgraded to 0.2.5

2016-02-11 15:27:08 +00:00

user_api_client.py

Merge branch 'master' into forgot-password

2016-03-08 15:03:25 +00:00