mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-06-03 17:39:45 +00:00
3f27e9bb57
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
1.4 KiB
1.4 KiB