svetlana maleeva 7b659856e6 Merge branch 'feature/add-links' into feature/build6.3 ... # Conflicts: # Web/Controls/Help/ABCIndex/CompleteArticleList.ascx # Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ascx # Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.es.ascx # Web/Controls/Help/Desktop/Documents/Common/ProtectDocumentWithPassword/ProtectDocumentWithPassword.ru.ascx # Web/OfficeWeb/apps/documenteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/de/UsageInstructions/FontTypeSizeColor.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/FontTypeSizeColor.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertCharts.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/ParagraphIndents.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/Wordpress.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/ProgramInterface/PluginsTab.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertChart.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/PivotTables.htm		2021-03-31 17:57:54 +03:00
..
SiteMap.ascx	Merge branch 'feature/add-links' into feature/build6.3	2021-03-31 17:57:54 +03:00