Merge branch 'develop' into circleci

This commit is contained in:
Christopher Willis-Ford 2020-07-29 14:30:47 -07:00
commit 7053eed00f

2
package-lock.json generated
View file

@ -9452,7 +9452,7 @@
}
},
"scratch-gui": {
"version": "github:LLK/scratch-gui#cf936d1371f6917961f31074c7425dbffba6b67c",
"version": "github:LLK/scratch-gui#194a039f143cb6326e9c8456dcc66d5a22ae774f",
"from": "github:LLK/scratch-gui#scratch-desktop",
"dev": true
},