Shane Kilkelly 97a6ac0f00 Merge branch 'master' into sk-passport ...

# Conflicts:
#	app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee

2016-09-15 14:48:51 +01:00

..

AuthorizationManager.coffee

Allow admin access to projects

2016-03-21 17:03:41 +00:00

AuthorizationMiddlewear.coffee

Merge branch 'master' into sk-passport

2016-09-15 14:48:51 +01:00

PrivilegeLevels.coffee

Convert privilege levels to an enum

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

PublicAccessLevels.coffee

Convert privilege levels to an enum

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