svetlana maleeva 32f1d0849e Merge branch 'feature/fix-merge-cells' into release/1.6.0 ... # Conflicts: # Web/App_GlobalResources/Resource.de.resx # Web/App_GlobalResources/Resource.resx # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/UsageInstructions/MergeCells.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/MergeCells.htm		2022-08-02 16:12:29 +03:00
..
common/main/resources/help	Remove download.html	2022-06-21 14:38:27 +03:00
documenteditor/main/resources/help	Merge branch 'feature/web-apps-help-german' into release/1.6.0	2022-08-02 14:27:19 +03:00
presentationeditor/main/resources/help	Merge branch 'feature/web-apps-help-german' into release/1.6.0	2022-08-02 14:27:19 +03:00
spreadsheeteditor/main/resources/help	Merge branch 'feature/fix-merge-cells' into release/1.6.0	2022-08-02 16:12:29 +03:00