Merge branch 'develop' into keystore-autofill

This commit is contained in:
James Prado 2018-02-05 11:14:59 -05:00 committed by GitHub
commit 6f28824c1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -27,12 +27,12 @@
"idna-uts46": "1.1.0",
"jsonschema": "1.2.2",
"ledgerco": "1.2.1",
"lodash": "4.17.4",
"lodash": "4.17.5",
"moment": "2.20.1",
"normalizr": "3.2.4",
"qrcode": "1.2.0",
"qrcode.react": "0.7.2",
"query-string": "5.0.1",
"query-string": "5.1.0",
"rc-slider": "8.6.0",
"react": "16.2.0",
"react-dom": "16.2.0",
@ -117,7 +117,7 @@
"sass-loader": "6.0.6",
"style-loader": "0.20.0",
"thread-loader": "1.1.2",
"ts-jest": "22.0.2",
"ts-jest": "22.0.3",
"ts-loader": "3.3.1",
"tslint": "5.9.1",
"tslint-config-prettier": "1.7.0",