diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-04-10 04:56:59 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-10 04:56:59 +0800 |
commit | df1f891585dc41a7d725d592902a84e432e66dc4 (patch) | |
tree | e450c931e8d6d4a1277fd57e330fa8882d7cc93f /package.json | |
parent | 931ce120737210cbbf6736b454580ac0610f527a (diff) | |
parent | 305f5f0034f347ee3eacbc4e6ef41817c1de9ab2 (diff) | |
download | tangerine-wallet-browser-df1f891585dc41a7d725d592902a84e432e66dc4.tar tangerine-wallet-browser-df1f891585dc41a7d725d592902a84e432e66dc4.tar.gz tangerine-wallet-browser-df1f891585dc41a7d725d592902a84e432e66dc4.tar.bz2 tangerine-wallet-browser-df1f891585dc41a7d725d592902a84e432e66dc4.tar.lz tangerine-wallet-browser-df1f891585dc41a7d725d592902a84e432e66dc4.tar.xz tangerine-wallet-browser-df1f891585dc41a7d725d592902a84e432e66dc4.tar.zst tangerine-wallet-browser-df1f891585dc41a7d725d592902a84e432e66dc4.zip |
Merge branch 'master' into i3621-LogoPerformance
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package.json b/package.json index 11d2bb441..d3cae3e15 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", "etherscan-link": "^1.0.2", - "ethjs": "^0.2.8", + "ethjs": "^0.3.4", "ethjs-contract": "^0.1.9", "ethjs-ens": "^2.0.0", "ethjs-query": "^0.3.4", @@ -114,7 +114,7 @@ "gulp-autoprefixer": "^5.0.0", "gulp-debug": "^3.2.0", "gulp-eslint": "^4.0.0", - "gulp-sass": "^3.1.0", + "gulp-sass": "^4.0.0", "hat": "0.0.3", "human-standard-token-abi": "^1.0.2", "idb-global": "^2.1.0", @@ -145,6 +145,7 @@ "post-message-stream": "^3.0.0", "promise-filter": "^1.1.0", "promise-to-callback": "^1.0.0", + "prop-types": "^15.6.1", "pump": "^3.0.0", "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", @@ -156,6 +157,7 @@ "react-hyperscript": "^3.0.0", "react-markdown": "^3.0.0", "react-redux": "^5.0.5", + "react-router-dom": "^4.2.2", "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", "react-tippy": "^1.2.2", |