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
..
community	Merge branch 'feature/structure' into feature/structure-new	2020-09-22 11:00:57 +03:00
document	Merge branch 'feature/structure' into feature/structure-new	2020-09-22 11:00:57 +03:00
enterprise	Changed product names for Workspace	2020-09-01 13:26:27 +03:00
mail	Enhancement: removed unused IDs (part I)	2017-07-17 18:09:27 +03:00
opensource	Changed top control for Workspace CE	2020-09-01 13:47:31 +03:00
talk	Structure changes	2020-08-06 19:22:44 +03:00