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
..
ShareDocumentsPersonal.ascx	Merge branch 'feature/workspace-12.5' into release/1.11.0	2023-03-24 16:21:30 +03:00
ShareDocumentsPersonal.de.ascx	Merge branch 'feature/workspace-12.5' into release/1.11.0	2023-03-24 16:21:30 +03:00