svetlana maleeva 94c40d8b70 Merge branch 'feature/test-merge-for-release-v3' into feature/test-merge-for-release-v2 ... # Conflicts: # Web/App_GlobalResources/Resource.fr.resx		2022-03-25 16:43:05 +03:00
..
Cloudron	Add ONLYOFFICE Docs EE on Cloudron; Minor Installation section menu adjustments; Change step 3 for Cloudron article	2022-01-13 16:21:18 +03:00
ControlPanel	Finish editing local-server.ascx	2022-03-15 14:25:37 +03:00
Desktop	Merge remote-tracking branch 'remotes/origin/feature/desktop-arch' into feature/test-merge-for-release	2022-03-18 14:06:50 +03:00
DeveloperEdition	Merge remote-tracking branch 'remotes/origin/feature/alibaba-cloud' into feature/test-merge-for-release	2022-03-17 15:13:40 +03:00
DigitalOcean	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
DocsEnterprise	Merge remote-tracking branch 'remotes/origin/feature/alibaba-cloud' into feature/test-merge-for-release	2022-03-17 15:13:40 +03:00
Enterprise	Finish editing local-server.ascx	2022-03-15 14:25:37 +03:00
FAQ	Finish editing local-server.ascx	2022-03-15 14:25:37 +03:00
GettingStarted	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
Guides	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
HostingSolutions
MobileApps	Fixes for groups-gettingstarted-projects.aspx Part 1	2022-03-24 09:59:42 +03:00
ONLYOFFICEEditors	Merge remote-tracking branch 'remotes/origin/feature/jitsi' into feature/test-prerelease-1.4.0	2022-02-11 14:46:39 +03:00
PDF
ServerDocker	Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release	2022-03-18 16:40:41 +03:00
ServerLinux	Merge remote-tracking branch 'remotes/origin/feature/remove-docs-ubuntu' into feature/test-merge-for-release	2022-03-18 13:55:12 +03:00
ServerWindows	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
TipsTricks	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
Troubleshooting	Add ONLYOFFICE Personal section	2022-02-01 13:52:38 +03:00
Video	Fixes for groups-gettingstarted-projects.aspx - Part 2	2022-03-25 14:13:39 +03:00
Virtual
Vultr	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
XMPPServer/01_xmpp_ports