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

Conflicts:
	app/main/views/invites.py

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

..

__init__.py

108536234: created users and roles data and domain model.

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

services_dao.py

Refactored register_errorhandlers so that it handles HTTPError

2016-03-10 11:53:29 +00:00

templates_dao.py

Merge branch 'master' into error-handling

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

users_dao.py

Handle HTTPError from API and routing errors from flask.

2016-03-10 14:56:47 +00:00