svetlana maleeva 043689366c Merge branch 'feature/workspace-12.5' into release/1.11.0 ... # Conflicts: # Web/App_GlobalResources/Resource.de.resx # Web/App_GlobalResources/Resource.es.resx # Web/App_GlobalResources/Resource.fr.resx # Web/App_GlobalResources/Resource.resx # Web/App_GlobalResources/Resource.ru.resx # Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/CommunicationPlugins.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HTML.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HighlightedCode.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertReferences.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Jitsi.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/PhotoEditor.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Speech.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Thesaurus.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Translator.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Typograf.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/WordCounter.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/CommunicationPlugins.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/HighlightedCode.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/PhotoEditor.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Thesaurus.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Translator.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/CommunicationPlugins.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/HighlightedCode.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PhotoEditor.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Thesaurus.aspx # Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Translator.aspx		2023-03-24 16:21:30 +03:00
..
administration	Edit controls in articles complete list, edit several tags	2023-03-15 17:30:01 +03:00
App_Code
App_Data
App_GlobalResources	Merge branch 'feature/workspace-12.5' into release/1.11.0	2023-03-24 16:21:30 +03:00
Bin
Controls	Merge branch 'feature/workspace-12.5' into release/1.11.0	2023-03-24 16:21:30 +03:00
css	Merge branch 'feature/new_plugins' into release/1.11.0	2023-03-24 15:50:18 +03:00
downloads
faq
GettingStarted/Integration	Edit controls in ArticlesCompleteList and .resx files for Installation -> Desktop section	2023-02-13 12:53:58 +03:00
Guides	Continue fixes in ArticlesCompleteList	2023-03-10 14:13:11 +03:00
images	Merge branch 'feature/workspace-12.5' into release/1.11.0	2023-03-24 16:21:30 +03:00
installation	Edit controls in ArticlesCompleteList and .resx files for Installation -> Desktop section	2023-02-13 12:53:58 +03:00
Integration	Merge branch 'feature/mattermost-new' into release/1.10.0	2023-03-06 18:04:40 +03:00
js	Update translations (fr)	2023-03-06 13:58:50 +03:00
Masters
Mobile-Applications	Merge remote-tracking branch 'remotes/origin/feature/ios_7.3' into release/1.11.0	2023-03-24 15:48:22 +03:00
OfficeWeb	Merge branch 'feature/new_plugins' into release/1.11.0	2023-03-24 15:50:18 +03:00
ONLYOFFICE-Editors	Merge branch 'feature/workspace-12.5' into release/1.11.0	2023-03-24 16:21:30 +03:00
Templates
Troubleshooting
UserGuides	Merge branch 'feature/workspace-12.5' into release/1.11.0	2023-03-24 16:21:30 +03:00
Video	Continue fixes in ArticlesCompleteList	2023-03-10 14:13:11 +03:00
403.htm
404.htm
500.htm
abc-index.aspx
administration.aspx
browser-not-supported.htm
change.log
contribution.aspx
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
Web.helpcenter.teamlab.com.config
web.remote.config
Web.test-helpcenter.teamlab.com.config
webinars.aspx
website.publishproj