aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-10-29 07:19:03 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-10-29 07:19:03 +0800
commit6eb6968037aeacd9c876912634ca5f4b5287957b (patch)
tree9e7c4978d07151eb44efedf4f335de300d62f543 /package.json
parentb3cb3e9ec67a138767bb2d6833c9056a66d46b92 (diff)
parent48220cff0e57ea56d3b3e2c2711ca83a4db96c01 (diff)
downloadtangerine-wallet-browser-6eb6968037aeacd9c876912634ca5f4b5287957b.tar.gz
tangerine-wallet-browser-6eb6968037aeacd9c876912634ca5f4b5287957b.tar.zst
tangerine-wallet-browser-6eb6968037aeacd9c876912634ca5f4b5287957b.zip
Merge branch 'master' into i328-MultiVault
Diffstat (limited to 'package.json')
-rw-r--r--package.json5
1 files changed, 2 insertions, 3 deletions
diff --git a/package.json b/package.json
index bb472a8fe..b3341e0ca 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"dnode": "^1.2.2",
"end-of-stream": "^1.1.0",
"ensnare": "^1.0.0",
- "eth-bin-to-ops": "^1.0.0",
+ "eth-bin-to-ops": "^1.0.1",
"eth-lightwallet": "^2.3.3",
"eth-query": "^1.0.3",
"eth-store": "^1.1.0",
@@ -84,14 +84,13 @@
"three.js": "^0.73.2",
"through2": "^2.0.1",
"vreme": "^3.0.2",
- "web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
+ "web3": "0.17.0-beta",
"web3-provider-engine": "^8.1.5",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},
"devDependencies": {
"babel-eslint": "^6.0.5",
- "babel-preset-es2015": "^6.6.0",
"babel-register": "^6.7.2",
"babelify": "^7.2.0",
"beefy": "^2.1.5",