Rebecca Law bfea4a42bc Merge branch 'master' into cancel-invited-user ...

Conflicts:
	app/notify_client/invite_api_client.py
	tests/app/main/views/test_manage_users.py

2016-03-01 18:01:20 +00:00

..

dao

Make send the send flow generic

2016-02-24 09:23:38 +00:00

notifications

…

views

Merge branch 'master' into cancel-invited-user

2016-03-01 18:01:20 +00:00

__init__.py

[WIP] Start of user accepting invite.

2016-03-01 14:10:35 +00:00

encryption.py

…

forms.py

Reword the add service page

2016-02-26 13:17:58 +00:00

uploader.py

In case there are problems reading back the csv file from

2016-02-05 16:13:06 +00:00

validators.py

…