Merge pull request #3865 from LLK/develop

Merge new render and paper.js changes into release
This commit is contained in:
DD Liu 2020-05-06 19:37:54 -04:00 committed by GitHub
commit 227477125e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View file

@ -16257,9 +16257,9 @@
} }
}, },
"scratch-gui": { "scratch-gui": {
"version": "0.1.0-prerelease.20200506210159", "version": "0.1.0-prerelease.20200506225657",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200506210159.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200506225657.tgz",
"integrity": "sha512-pcImJTkN/vVgvegrpeHsKyzKMet4HqlOAkSoXgIhlJ77fse2aTCsfXu4kMjd7J46jJVsfIJJ9TFJwfL2IGpRfg==", "integrity": "sha512-MhDIsvdMw8See61hf355CATKMO4v1y8vt3DNBjRj0of0pXF8PyagaF2+m2vMwe1/PvJkNhXmRkWbb+RwArKuyQ==",
"dev": true "dev": true
}, },
"scratch-l10n": { "scratch-l10n": {

View file

@ -128,7 +128,7 @@
"redux-mock-store": "^1.2.3", "redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1", "redux-thunk": "2.0.1",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20200506210159", "scratch-gui": "0.1.0-prerelease.20200506225657",
"scratch-l10n": "latest", "scratch-l10n": "latest",
"selenium-webdriver": "3.6.0", "selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",