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
..
DeveloperActivation	InstallationGuides section	2020-09-22 10:02:59 +03:00
DocAvailableLanguages	InstallationGuides section	2020-09-22 10:02:59 +03:00
DocServerChangelog	InstallationGuides section	2020-09-22 10:02:59 +03:00
DocServerProxy	Changed product names	2020-09-17 18:11:11 +03:00
EnterpriseActivation	InstallationGuides section	2020-09-22 10:02:59 +03:00
NextcloudProxy	InstallationGuides section	2020-09-22 10:02:59 +03:00
ThirdPartyDomains	InstallationGuides section	2020-09-22 10:02:59 +03:00
Document.ascx	Changed product names	2020-09-17 18:22:37 +03:00
Document.ru.ascx	Changed product names	2020-09-17 18:22:37 +03:00
DSChangelog.ascx	Updated Document Server changelog	2020-08-13 18:32:50 +03:00
DSChangelog.ru.ascx	Update: Added Document Server 5.5.3 changelog (Ru,En); Added guides for Mendeley and Zotero plugins (En); Updated desktop and online editors interface screenshots (Ru, En)	2020-05-25 17:55:58 +03:00