Conflicts: UI/Common/UIxAclEditor.m UI/Common/UIxUserRightsEditor.m UI/Common/product.plist UI/Contacts/UIxContactsUserRightsEditor.m UI/Templates/ContactsUI/UIxContactFoldersView.wox UI/WebServerResources/js/Common/resource.js UI/WebServerResources/js/ContactsUI.js |
||
---|---|---|
.. | ||
acl-model.js | ||
resource.js | ||
SOGoAuthentication.js | ||
ui-desktop.js | ||
ui-mobile.js | ||
user-model.js | ||
utils.js |