svetlana maleeva 1dc034de40 Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release ... # Conflicts: # Web/Controls/Help/Administration/Administration.ascx # Web/Controls/Help/Administration/ControlPanel.ascx # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ascx # Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.de.ascx # Web/Controls/Help/ArticlesCompleteList/Guides/151_share_text/151_share_text.ascx # Web/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/2021_using-chat.ascx # Web/Controls/Help/ArticlesCompleteList/TipsTricks/130_folder_permissions/130_folder_permissions.ascx # Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx # Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.de.ascx # Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx # Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/EditorsUserGuides.ascx # Web/Controls/Help/Tags/generate-report/generate-report.ascx # Web/Controls/Help/Tags/generate-report/generate-report.de.ascx # Web/Controls/Help/Tags/manage-access-rights/manage-access-rights.ascx # Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.ascx # Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.de.ascx # Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.ascx # Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.de.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.de.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.es.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.fr.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.it.ascx # Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ru.ascx # Web/Controls/Help/Tags/report-templates/report-templates.ascx # Web/Controls/Help/Tags/report-templates/report-templates.de.ascx # Web/Controls/Help/Tags/security/security.ascx # Web/Controls/Help/Tags/security/security.de.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.de.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.es.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.fr.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.it.ascx # Web/Controls/Help/Tags/track-birthdays/track-birthdays.ru.ascx # Web/Controls/Help/UserGuides/DocsGuides.ascx # Web/Controls/Help/UserGuides/DocsGuides.de.ascx # Web/Controls/Help/UserGuides/DocsGuides.fr.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.de.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.fr.ascx # Web/Controls/Help/UserGuides/DocsUserGuides.ru.ascx # Web/Controls/Help/UserGuides/Groups.ascx # Web/Controls/Help/UserGuides/Groups.de.ascx # Web/Controls/Help/UserGuides/GroupsDocuments.ascx # Web/Controls/Help/UserGuides/GroupsMail.de.ascx # Web/Controls/Help/UserGuides/GroupsProjects.ascx # Web/Controls/Help/UserGuides/GroupsProjects.de.ascx # Web/Controls/Help/UserGuides/UserGuides.ascx # Web/ONLYOFFICE-Editors/Editors-User-Guides/DocumentEditor/Add-watermark.aspx # Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-and-unmerge-cells.aspx # Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-cells.aspx		2022-04-20 16:11:30 +03:00
..
AdministrationGuides	German translation completed.	2021-10-13 23:15:34 +03:00
Appendix	bugfix links	2021-11-24 19:03:33 +03:00
Cloud	Фикс прекомпиляции хелпцентра	2021-11-24 19:02:19 +03:00
Desktop/Documents	Фикс прекомпиляции хелпцентра	2021-11-24 19:02:19 +03:00
features	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
InstallationGuides	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
Integration	Merge branch 'feature/strapi_connector' into feature/test-merge-for-release	2022-04-13 09:29:40 +03:00
MobileApps	Rename controls	2022-02-15 17:04:43 +03:00
NewSections	Added translations for Main sections, Sidemenu, DownloadButtons, Video, and Desktop mac OS Installation article (ru)	2021-02-11 17:42:48 +03:00
OneClickInstallation	Фикс прекомпиляции хелпцентра	2021-11-24 19:02:19 +03:00
Partners	First commit	2016-08-29 16:51:20 +03:00
Server	Rename controls	2022-02-15 17:04:43 +03:00
UserGuides	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00