Rebecca Law 8737edfad1 Merge branch 'master' of github.com:alphagov/notifications-admin into api-keys-flow ...

Conflicts:
	tests/app/main/views/test_api_keys.py

2016-01-21 12:31:28 +00:00

..

__init__.py

…

api_client.py

Updated to send email through the client send_email.

2016-01-20 14:45:50 +00:00

api_key_api_client.py

Implementation of api key pages.

2016-01-21 12:28:05 +00:00

sender.py

Merge with master.

2016-01-19 09:49:01 +00:00

user_api_client.py

Verify activate and login user with sms and email code

2016-01-20 15:34:42 +00:00