Merge hotfix commits into develop. Develop is ahead of hotfix so it shouldn't change anything, just keep master and develop in sync hopefully...

This commit is contained in:
DD Liu 2020-08-31 13:54:50 -04:00
commit 89bb784a4d
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View file

@ -15664,9 +15664,9 @@
}
},
"scratch-gui": {
"version": "0.1.0-prerelease.20200831120820",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200831120820.tgz",
"integrity": "sha512-nCr+U+9uXvn9C6nMMozentYGV2CpJsnswchjUV+YP7Z3IkSLwNmOIfKtxZUn7QUvjZfoX7RCEulUMdtoQ7miFw==",
"version": "0.1.0-prerelease.20200827215238",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200827215238.tgz",
"integrity": "sha512-gjiPszERfAZ8ygfQlCttuzS5hbqtoLZgnYMmwTkjqbivw3jJNIVMSUsgXaw1iAPUwkBfzVzyw9pENAdntMZZ+g==",
"dev": true
},
"scratch-l10n": {

View file

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