aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-02-24 06:17:52 +0800
committerKevin Serrano <kevgagser@gmail.com>2017-02-24 06:17:52 +0800
commit30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5 (patch)
tree831a0441622eb017e64dc9a8c513c82b2a8f7c08 /package.json
parent6b56d6ba9853ec978cd2d3d030882fa5ee3645cd (diff)
parent09c7b9d242f66db99c80f22fae00dfdb894e2adc (diff)
downloadtangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.gz
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.bz2
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.lz
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.xz
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.zst
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.zip
Merge github.com:MetaMask/metamask-plugin into i765-gaslimits
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json
index 11cb353ea..9f56d8b12 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
"iframe-stream": "^1.0.2",
"inject-css": "^0.1.1",
"jazzicon": "^1.2.0",
+ "loglevel": "^1.4.1",
"menu-droppo": "^1.1.0",
"metamask-logo": "^2.1.2",
"mississippi": "^1.2.0",
@@ -105,7 +106,7 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "0.18.2",
- "web3-provider-engine": "^8.5.0",
+ "web3-provider-engine": "^9.1.0",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},