Rebecca Law 4ba801edab Merge branch 'master' into error-handling ...

Conflicts:
	app/main/views/invites.py

2016-03-10 15:03:21 +00:00

..

app

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +00:00

__init__.py

…

conftest.py

Service name uniqueness handled in all cases and tests passing.

2016-03-10 14:29:31 +00:00