mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-02-23 02:16:23 +00:00
Conflicts: UI/Templates/ContactsUI/UIxContactEditorTemplate.wox UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox UI/Templates/MailerUI/UIxMailMainFrame.wox UI/Templates/MainUI/SOGoRootPage.wox UI/Templates/PreferencesUI/UIxAccountEditor.wox UI/Templates/PreferencesUI/UIxPreferences.wox UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox UI/Templates/SchedulerUI/UIxCalMainView.wox UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox UI/WebServerResources/angular-material