Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
UIxContactFoldersView.wox |
Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/WebServerResources/js/Common/acl-model.js |
||
---|---|---|
.. | ||
UIxContactFoldersView.wox |