Rebecca Law 46e0e3fd1b Merge branch 'master' into api-keys-flow ...

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

2016-01-21 15:50:00 +00:00

..

__init__.py

108537814: Implementation of 3 factor authentication.

2015-12-04 16:27:11 +00:00

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

Fixed some tests. Some broken mocked tests commented out until later

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