diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-08-16 01:50:53 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-08-16 01:50:53 +0800 |
commit | 6895d330ffdf0f071e4df3fb9da47f2ea6fc7491 (patch) | |
tree | 64e170d2bd39434674e0c92bb637fd1d2c57debc /package.json | |
parent | cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f (diff) | |
parent | 271e3c4fdf1a86a989d642c18815d7f6537ed951 (diff) | |
download | tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.gz tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.bz2 tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.lz tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.xz tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.zst tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.zip |
Merge master.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/package.json b/package.json index 4b1315008..f3ed0da4d 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "debounce": "^1.0.0", "dnode": "^1.2.2", "end-of-stream": "^1.1.0", + "ensnare": "^1.0.0", "eth-bin-to-ops": "^1.0.0", "eth-lightwallet": "^2.3.3", "eth-query": "^1.0.3", @@ -53,6 +54,7 @@ "once": "^1.3.3", "pojo-migrator": "^2.1.0", "polyfill-crypto.getrandomvalues": "^1.0.0", + "post-message-stream": "^1.0.0", "pumpify": "^1.3.4", "react": "^15.0.2", "react-addons-css-transition-group": "^15.0.2", @@ -73,7 +75,7 @@ "vreme": "^3.0.2", "web3": "ethereum/web3.js#0.16.0", "web3-provider-engine": "^7.8.3", - "web3-stream-provider": "^2.0.5", + "web3-stream-provider": "^2.0.6", "xtend": "^4.0.1" }, "devDependencies": { @@ -107,6 +109,7 @@ "qunit": "^0.9.1", "sinon": "^1.17.3", "tape": "^4.5.1", + "testem": "^1.10.3", "uglifyify": "^3.0.1", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0", |