Merge branch 'develop' into greenkeeper/scratch-render-0.1.0-prerelease.20191101193213

package-lock.json

@@ -11482,9 +11482,9 @@
       }
     },
     "scratch-paint": {
-      "version": "0.2.0-prerelease.20191010161144",
-      "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20191010161144.tgz",
-      "integrity": "sha512-mItiFbEOWMblwJnFjbM1VBp5bGGkGCM4uc4fM2ej40hjQotD2SAhHfGPHhLRhtk3vEq+mcyq4iJfJo2h3Hqmkg==",
+      "version": "0.2.0-prerelease.20191101193358",
+      "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20191101193358.tgz",
+      "integrity": "sha512-B5In4pkoflFp01ew4xi5Nh2/+EGiyz0E9Zt5+2iAC29NGzgSWV31RDNARzuxDWq6DiKl0N21h3iv7/K1VwVhSA==",
       "dev": true,
       "requires": {
         "@scratch/paper": "0.11.20190729152410",
@@ -11494,7 +11494,8 @@
         "lodash.omit": "4.5.0",
         "minilog": "3.1.0",
         "parse-color": "1.0.0",
-        "prop-types": "^15.5.10"
+        "prop-types": "^15.5.10",
+        "scratch-svg-renderer": "0.2.0-prerelease.20191031221353"
       },
       "dependencies": {
         "classnames": {

package.json

@@ -110,7 +110,7 @@
     "scratch-audio": "0.1.0-prerelease.20190925183642",
     "scratch-l10n": "3.6.20191008224547",
     "scratch-blocks": "0.1.0-prerelease.1572384380",
-    "scratch-paint": "0.2.0-prerelease.20191010161144",
+    "scratch-paint": "0.2.0-prerelease.20191101193358",
     "scratch-render": "0.1.0-prerelease.20191101193213",
     "scratch-storage": "1.3.2",
     "scratch-svg-renderer": "0.2.0-prerelease.20191031221353",