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
..
administration	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
AdministratorGuides	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
App_Code
App_Data
App_GlobalResources	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Bin
Controls	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
css	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
desktop/documents	Remove old redirected article pages for Installation section; add missing redirects	2022-03-27 13:20:18 +03:00
downloads
faq
GettingStarted/Integration	Try to fix groups-authorization-keys.aspx	2022-03-30 23:53:26 +03:00
Guides	Fix administration/configuration.aspx	2022-04-05 12:57:43 +03:00
images	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
installation	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Integration	Structure fix for new Strapi article	2022-04-13 10:02:54 +03:00
js	Merge remote-tracking branch 'remotes/origin/feature/german_installation_guides' into feature/test-merge-for-release	2022-03-21 12:19:07 +03:00
Masters
Mobile-Applications
OfficeWeb/apps	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
ONLYOFFICE-Editors	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
server/virtual	Remove old redirected pages for Control Panel section	2022-03-29 19:21:01 +03:00
Templates
Troubleshooting	Fix administration/configuration.aspx	2022-04-05 12:57: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
Video	Merge branch 'feature/moodle' into feature/test-merge-for-release	2022-04-05 15:33:55 +03:00
403.htm
404.htm
500.htm
abc-index.aspx
administration.aspx
browser-not-supported.htm
change.log
FAQ.aspx
Global.asax
glossary.aspx
google-conversion-tracker.htm
index.aspx
installation.aspx
Integration.aspx
PdfHowTo.aspx
promo-materials.aspx
proxy.ashx
robots.txt
Search.aspx
sitemap.aspx
sitemap.xml
Startup.htm
tags.aspx
userguides.aspx
Video.aspx
web.config	Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release	2022-04-20 16:11:30 +03:00
Web.helpcenter.teamlab.com.config
web.remote.config
Web.test-helpcenter.teamlab.com.config
webinars.aspx
website.publishproj