Andrew b7780682d5 Merge branch 'dev' into 'merge/api-v2' ... # Conflicts: # app/classes/controllers/crafty_perms_controller.py		2022-05-18 21:56:39 +00:00
..
crafty_perms_controller.py	Merge branch 'dev' into 'merge/api-v2'	2022-05-18 21:56:39 +00:00
management_controller.py	Refactor to standardize class/variable naming ✨	2022-04-14 03:10:25 +01:00
roles_controller.py	Fix a bug in update_role_advanced	2022-05-18 01:25:27 +03:00
server_perms_controller.py	Add a permission matrix to the role add and edit	2022-05-18 01:09:58 +03:00
servers_controller.py	Merge branch 'dev' into merge/api-v2	2022-05-18 01:49:19 +03:00
users_controller.py	Merge branch 'dev' into 'merge/api-v2'	2022-05-18 21:56:39 +00:00