Nicholas Staples 48daac7b94 Merging conflict with two_factor.py ...

Fixed merge mistake with two_factor.py.

2016-03-30 10:11:06 +01:00

..

__init__.py

…

templates_dao.py

A platform admin user is able to see a list of all services.

2016-03-17 10:46:47 +00:00