svetlana maleeva 5baa63fd9b Merge branch 'feature/structure' into feature/structure-new ... # Conflicts: # Web/Controls/Help/ABCIndex/CompleteArticleList.ascx # Web/Controls/Help/ArticlesCompleteList/Desktop/100025_pro_features/100025_pro_features.ascx # Web/Controls/Help/Server/Docker/Document/DockerInstallation/DockerInstallation.ascx # Web/Controls/Help/Server/Docker/Document/DockerInstallation/DockerInstallation.es.ascx # Web/Controls/Help/Server/Docker/Document/DockerInstallation/DockerInstallation.ru.ascx # Web/Controls/Help/Server/Linux/Document/LinuxInstallationCentOS/LinuxInstallationCentOS.ascx # Web/Controls/Help/Server/Linux/Document/LinuxInstallationCentOS/LinuxInstallationCentOS.es.ascx # Web/Controls/Help/Server/Linux/Document/LinuxInstallationCentOS/LinuxInstallationCentOS.ru.ascx # Web/Controls/Help/Server/Linux/Document/LinuxInstallationEnterprise36/LinuxInstallationEnterprise36.ascx # Web/Controls/Help/Server/Linux/Document/LinuxInstallationEnterprise36/LinuxInstallationEnterprise36.es.ascx # Web/Controls/Help/Server/Linux/Document/LinuxInstallationEnterprise36/LinuxInstallationEnterprise36.ru.ascx # Web/Controls/Help/Server/Windows/Document/AddThemes/AddThemes.ascx # Web/Controls/Help/Server/Windows/Document/AddThemes/AddThemes.ru.ascx # Web/Controls/Help/SideMenu/Server/CommunityEdition/CommunityEdition.ascx # Web/Controls/Help/Tags/local-server/local-server.ascx # Web/Controls/Help/Tags/local-server/local-server.de.ascx # Web/Controls/Help/Tags/local-server/local-server.es.ascx # Web/Controls/Help/Tags/local-server/local-server.fr.ascx # Web/Controls/Help/Tags/local-server/local-server.it.ascx # Web/Controls/Help/Tags/local-server/local-server.ru.ascx # Web/css/help.less # Web/server/docker/opensource/deploy-community-edition-in-digitalocean.aspx # Web/server/windows/document/install-office-apps.aspx		2020-09-22 11:00:57 +03:00
..
CommunityEdition	Merge branch 'feature/structure' into feature/structure-new	2020-09-22 11:00:57 +03:00
CommunityServer	First commit	2016-08-29 16:51:20 +03:00
DeveloperEdition	Update: Integration/Developer Edition pages	2017-10-31 17:04:22 +03:00
DocumentServer	First commit	2016-08-29 16:51:20 +03:00
DocumentServerEE	Structure changes	2020-08-06 19:22:44 +03:00
EnterpriseEdition	Correction: removed Education Edition and virtual machine articles from everywhere	2018-06-01 16:02:23 +03:00
HostingEdition	новые страницы для хостеров, кнопки для перехода на основной сайт и мелкие правки	2016-09-07 10:03:22 +03:00
IntegrationEdition	Новая инструкция по установке Integration Edition для Windows (+ перевод на русский)	2016-10-31 18:09:23 +03:00
MailServer	First commit	2016-08-29 16:51:20 +03:00
OneClickInstallation	First commit	2016-08-29 16:51:20 +03:00
XMPPServer	Structure changes	2020-08-06 19:22:44 +03:00