svetlana maleeva 8ff9bb1318 Merge branch 'feature/build7.5' into release/1.17.0 ... # Conflicts: # Web/App_GlobalResources/Resource.fr.resx		2023-10-17 13:35:19 +03:00
..
de	Minor fixes	2023-10-17 13:24:23 +03:00
en	Merge branch 'feature/build7.5' into release/1.17.0	2023-10-17 13:35:19 +03:00
es	Move editor.css to common folder according to changes in web-apps	2023-08-14 16:52:35 +03:00
fr	Minor fixes	2023-10-17 13:24:23 +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
editor.css	Replace 'apps' folder with the new one from 'web-apps' repository	2022-06-21 13:12:39 +03:00