svetlana maleeva 3d44f05afd Merge branch 'feature/web-apps-help' into release/1.6.0 ... # Conflicts: # Web/OfficeWeb/apps/documenteditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm # Web/OfficeWeb/apps/presentationeditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm # Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/HelpfulHints/SupportedFormats.htm # Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/it/HelpfulHints/SupportedFormats.htm		2022-07-19 16:34:01 +03:00
..
de	Merge branch 'feature/web-apps-help' into release/1.6.0	2022-07-19 16:34:01 +03:00
en	Merge branch 'feature/web-apps-help' into release/1.6.0	2022-07-19 16:34:01 +03:00
es	Merge branch 'feature/web-apps-help' into release/1.6.0	2022-07-19 16:34:01 +03:00
fr	Merge branch 'feature/web-apps-help' into release/1.6.0	2022-07-19 16:34:01 +03:00
images	Replace 'apps' folder with the new one from 'web-apps' repository	2022-06-21 13:12:39 +03:00
it	Merge branch 'feature/web-apps-help' into release/1.6.0	2022-07-19 16:34:01 +03:00
ru	Merge branch 'feature/web-apps-help' into release/1.6.0	2022-07-19 16:34:01 +03:00
scroll.css	Replace 'apps' folder with the new one from 'web-apps' repository	2022-06-21 13:12:39 +03:00