svetlana maleeva 53c515a803 Merge branch 'plugins' into editors6.0-new ... # Conflicts: # Web/Controls/Help/Tags/CompleteArticleList.ascx # Web/OfficeWeb/apps/documenteditor/main/resources/help/en/ProgramInterface/PluginsTab.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/en/ProgramInterface/ProgramInterface.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/fr/UsageInstructions/InsertSymbols.htm # Web/OfficeWeb/apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertSymbols.htm # Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertSymbols.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/ProgramInterface/PluginsTab.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertSymbols.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertSymbols.htm		2020-10-02 12:28:38 +03:00
..
resources/help	Merge branch 'plugins' into editors6.0-new	2020-10-02 12:28:38 +03:00