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
..
Documents.ascx	Merge branch 'feature/structure' into feature/structure-new	2020-09-22 11:00:57 +03:00
Documents.de.ascx	Updates: new video guide articles are added to the pages and lists	2019-05-22 18:36:13 +03:00
Documents.es.ascx	Updates: new video guide articles are added to the pages and lists	2019-05-22 18:36:13 +03:00
Documents.fr.ascx	Updates: new video guide articles are added to the pages and lists	2019-05-22 18:36:13 +03:00
Documents.it.ascx	Updates: new video guide articles are added to the pages and lists	2019-05-22 18:36:13 +03:00
Documents.ru.ascx	Added videos to pages	2020-07-10 13:42:34 +03:00