svetlana maleeva 7da3b35973 Merge branch 'feature/shortcuts' into release/1.17.0 ... # Conflicts: # Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/keytips1.png # Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/keytips2.png # Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/images/keytips1.png # Web/OfficeWeb/apps/presentationeditor/main/resources/help/ru/images/keytips2.png		2023-10-17 11:02:09 +03:00
..
de	Merge branch 'feature/build7.5' into release/1.17.0	2023-10-17 11:00:30 +03:00
en	Merge branch 'feature/shortcuts' into release/1.17.0	2023-10-17 11:02:09 +03:00
es	Move editor.css to common folder according to changes in web-apps	2023-08-14 16:52:35 +03:00
fr	Merge branch 'feature/shortcuts' into release/1.17.0	2023-10-17 11:02:09 +03:00
images	Merge remote-tracking branch 'remotes/origin/feature/pdfeditor_new' into feature/build7.5	2023-10-16 10:26:51 +02:00
it	Move editor.css to common folder according to changes in web-apps	2023-08-14 16:52:35 +03:00
ru	Merge branch 'feature/shortcuts' into release/1.17.0	2023-10-17 11:02:09 +03:00