Merge branch 'release' into dev

jgraph · Sep 2, 2022 · 577190b · 577190b
2 parents a90af15 + 60d1acf
commit 577190b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/drawio b/drawio
diff --git a/sync.js b/sync.js
@@ -3,7 +3,7 @@ const path = require('path')
 const child_process = require('child_process')
 
 const electronAppDir = path.join(__dirname, 'drawio', 'src/main/webapp')
-const appjsonpath = path.join(__dirname, 'drawio', 'src/main/webapp', 'package.json')
+const appjsonpath = path.join(__dirname, 'package.json')
 const disableUpdatePath = path.join(__dirname, 'drawio', 'src/main/webapp', 'disableUpdate.js')
 
 let ver = fs.readFileSync(path.join(__dirname, 'drawio', 'VERSION'), 'utf8')
+8 −0		ChangeLog
+1 −1		VERSION
+108 −433		src/main/webapp/js/app.min.js
+1 −1		src/main/webapp/js/diagramly/P2PCollab.js
+1 −326		src/main/webapp/js/freehand/perfect-freehand.js
+2 −0		src/main/webapp/js/grapheditor/Graph.js
+110 −434		src/main/webapp/js/integrate.min.js
+4 −3		src/main/webapp/js/shapes-14-6-5.min.js
+82 −81		src/main/webapp/js/viewer-static.min.js
+78 −78		src/main/webapp/js/viewer.min.js
+4 −4		src/main/webapp/mxgraph/mxClient.js
+38 −0		src/main/webapp/package.json
+1 −1		src/main/webapp/service-worker.js
+1 −1		src/main/webapp/service-worker.js.map
+2 −2		src/main/webapp/shapes/mxAWS4.js