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

..

assets

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

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

main

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

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

notify_client

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

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

status

Added status page

2016-01-11 14:54:23 +00:00

templates

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

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

__init__.py

Implementation of api key pages.

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

its_dangerous_session.py

…

models.py

User registration now creates user via api.

2016-01-19 22:49:46 +00:00

proxy_fix.py

…