-
Côme Chilliet authored
Conflicts: include/class_acl.inc include/simpleplugin/class_simplePlugin.inc plugins/admin/groups/class_groupManagement.inc
79372ce3
Conflicts: include/class_acl.inc include/simpleplugin/class_simplePlugin.inc plugins/admin/groups/class_groupManagement.inc