diff options
author | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:34:57 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:34:57 +0800 |
commit | 51ad2b03c82febf5259d32f4bd6f440b24235d7b (patch) | |
tree | 36ecc8a9e0adfcd35e18772b502569babd194f09 /package.json | |
parent | ba23843f91ca5046400cea14cea4c0d256578fec (diff) | |
parent | e99a707e3d5c0ad439930e72bad4cf0b5e005099 (diff) | |
download | tangerine-wallet-browser-51ad2b03c82febf5259d32f4bd6f440b24235d7b.tar tangerine-wallet-browser-51ad2b03c82febf5259d32f4bd6f440b24235d7b.tar.gz tangerine-wallet-browser-51ad2b03c82febf5259d32f4bd6f440b24235d7b.tar.bz2 tangerine-wallet-browser-51ad2b03c82febf5259d32f4bd6f440b24235d7b.tar.lz tangerine-wallet-browser-51ad2b03c82febf5259d32f4bd6f440b24235d7b.tar.xz tangerine-wallet-browser-51ad2b03c82febf5259d32f4bd6f440b24235d7b.tar.zst tangerine-wallet-browser-51ad2b03c82febf5259d32f4bd6f440b24235d7b.zip |
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json index 92f43337b..72fe57f9b 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.5.6", + "web3-provider-engine": "^13.8.0", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, @@ -223,7 +223,6 @@ "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", "gulp-eslint": "^4.0.0", - "gulp-if": "^2.0.2", "gulp-json-editor": "^2.2.1", "gulp-livereload": "^3.8.1", "gulp-replace": "^0.6.1", |