svetlana maleeva a878943fa2 Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release ... # Conflicts: # Web/Controls/Help/ArticlesCompleteList/Enterprise/110001_configure_enterprise.fr.ascx # Web/Controls/Help/ArticlesCompleteList/Enterprise/110002_renew_subscription.fr.ascx # Web/Controls/Help/ArticlesCompleteList/Enterprise/110007_switch_https_enterprise_package.fr.ascx # Web/Controls/Help/ArticlesCompleteList/Enterprise/110008_import_mail_from_exchange.fr.ascx # Web/Controls/Help/ArticlesCompleteList/Enterprise/110009_switch_https_enterprise_windows_script.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70034_enterprise_script_parameters.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70035_opensource_script_parameters.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70046_install_docker_integrated_document.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70054_deploy_community_in_digitalocean.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerDocker/70057_community_installation_compose.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60033_enterprise_script_RPM_DEB.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60034_opensource_script_RPM_DEB.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerLinux/60037_EE_AMI.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50012_enterprise.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50016_install_community_edition.fr.ascx # Web/Controls/Help/ArticlesCompleteList/ServerWindows/50026_enterprise_windows_upgrade.fr.ascx # Web/Controls/Help/ArticlesCompleteList/Vultr/0002_workspace.fr.ascx		2022-03-18 16:40:41 +03:00
..
Community	Edit other controls for installation/mail-connect-groups-windows.aspx	2022-03-16 17:44:14 +03:00
Document	Merge remote-tracking branch 'remotes/origin/feature/remove-docs-ubuntu' into feature/test-merge-for-release	2022-03-18 13:55:12 +03:00
Enterprise	Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release	2022-03-18 16:40:41 +03:00
Mail	Finish editing local-server.ascx	2022-03-15 14:25:37 +03:00
Opensource	Merge remote-tracking branch 'remotes/origin/feature/fr-installation' into feature/test-merge-for-release	2022-03-18 16:40:41 +03:00
Talk	Finish editing local-server.ascx	2022-03-15 14:25:37 +03:00