Merge with master.

This commit is contained in:
Nicholas Staples
2016-03-01 17:18:46 +00:00
16 changed files with 520 additions and 23 deletions

View File

@@ -18,7 +18,6 @@ default_service_permissions = [
MANAGE_API_KEYS,
MANAGE_TEMPLATES]
class PermissionDAO(DAOClass):
class Meta: