Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into dev…

…elop # Conflicts: # slide/Drawing/MorphTransition.js # slide/Editor/Format/Presentation.js
ONLYOFFICE · Oct 3, 2023 · 4d439b7 · 4d439b7
2 parents 8b882f3 + 4000a16
commit 4d439b7
Show file tree

Hide file tree

Showing 364 changed files with 36,947 additions and 5,663 deletions.
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
@@ -339,7 +339,8 @@ module.exports = function(grunt) {
 							cwd: '../common/',
 							src: [
 								'Charts/ChartStyles.js',
-								'SmartArts/SmartArts.bin',
+								'SmartArts/SmartArtData/*',
+								'SmartArts/SmartArtDrawing/*',
 								'Images/*',
 								'Images/placeholders/*',
 								'Images/content_controls/*',