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

..

components

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

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

error

Use correct heading class and better wording on error pages

2016-01-14 14:25:38 +00:00

views

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

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

admin_template.html

Put message previews on ‘Send SMS’ page

2016-01-20 13:12:20 +00:00

main_nav.html

Add pages for create/view/revoke API keys

2016-01-20 16:22:23 +00:00

withnav_template.html

Tidy up navigation code

2016-01-05 13:22:08 +00:00