Merge pull request #2854 from LLK/develop

Merge develop into release 3-21-2019
This commit is contained in:
picklesrus 2019-03-21 07:49:54 -04:00 committed by GitHub
commit c5bb61c288
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -34,7 +34,7 @@
"newrelic": "1.25.4",
"react-helmet": "5.2.0",
"scratch-docker": "^1.0.2",
"scratch-parser": "^4.2.0",
"scratch-parser": "^5.0.0",
"scratch-storage": "^0.5.1"
},
"devDependencies": {
@ -98,7 +98,7 @@
"react-responsive": "3.0.0",
"react-slick": "0.16.0",
"react-string-replace": "0.4.1",
"scratch-gui": "0.1.0-prerelease.20190314120430",
"scratch-gui": "0.1.0-prerelease.20190320192801",
"react-telephone-input": "4.3.4",
"redux": "3.5.2",
"redux-thunk": "2.0.1",