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

..

main

Merge branch 'master' into cancel-invited-user

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

__init__.py

108536234: created users and roles data and domain model.

2015-11-25 15:29:12 +00:00