Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
acl-model.js | ||
resource.js | ||
SOGoAuthentication.js | ||
ui-desktop.js | ||
ui-mobile.js | ||
user-model.js | ||
utils.js |
Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
acl-model.js | ||
resource.js | ||
SOGoAuthentication.js | ||
ui-desktop.js | ||
ui-mobile.js | ||
user-model.js | ||
utils.js |