diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-04-19 08:44:24 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-04-19 08:44:24 +0800 |
commit | dba41614d014413b6de72a2cb62466765706304d (patch) | |
tree | c4fbc7d5daf5690236dfc1df2b7c825d4b3f84f2 | |
parent | 7291e3f1b32f933ef1c8cc9c2f96f48bb6f33652 (diff) | |
parent | 09d74102a71fab8e008acf522538189594edff4f (diff) | |
download | tangerine-wallet-browser-dba41614d014413b6de72a2cb62466765706304d.tar.gz tangerine-wallet-browser-dba41614d014413b6de72a2cb62466765706304d.tar.zst tangerine-wallet-browser-dba41614d014413b6de72a2cb62466765706304d.zip |
Merge branch 'master' of github.com:MetaMask/metamask-plugin
-rw-r--r-- | package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json index 3981f3058..b2e2b3c61 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "eth-store": "^1.1.0", "ethereumjs-tx": "^1.0.0", "ethereumjs-util": "^4.3.0", - "faux-jax": "git+https://github.com/kumavis/faux-jax.git#c3648de04804f3895c5b4972750cae5b51ddb103", "hat": "0.0.3", "inject-css": "^0.1.1", "metamask-logo": "^1.1.5", @@ -53,7 +52,7 @@ "three.js": "^0.73.2", "through2": "^2.0.1", "web3": "^0.15.1", - "web3-provider-engine": "^7.2.1", + "web3-provider-engine": "^7.4.0", "xtend": "^4.0.1" }, "devDependencies": { |