Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
CommonUI | ||
ContactsUI | ||
MainUI |
Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
CommonUI | ||
ContactsUI | ||
MainUI |