aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-10-27 04:55:17 +0800
committerGitHub <noreply@github.com>2016-10-27 04:55:17 +0800
commit5f98814877b7050f6453b44fd47d34b9959add68 (patch)
tree1ebb030db2b649996166afc8b0249382bf114db6
parent9df20e6c5594ba733d749297b12872ef4a15cd79 (diff)
parentab055e3f6348a0ec63ef9bb1a7d032e6be03cd42 (diff)
downloadtangerine-wallet-browser-5f98814877b7050f6453b44fd47d34b9959add68.tar
tangerine-wallet-browser-5f98814877b7050f6453b44fd47d34b9959add68.tar.gz
tangerine-wallet-browser-5f98814877b7050f6453b44fd47d34b9959add68.tar.bz2
tangerine-wallet-browser-5f98814877b7050f6453b44fd47d34b9959add68.tar.lz
tangerine-wallet-browser-5f98814877b7050f6453b44fd47d34b9959add68.tar.xz
tangerine-wallet-browser-5f98814877b7050f6453b44fd47d34b9959add68.tar.zst
tangerine-wallet-browser-5f98814877b7050f6453b44fd47d34b9959add68.zip
Merge pull request #767 from MetaMask/UpdateWeb3
Update web3.js version
-rw-r--r--CHANGELOG.md1
-rw-r--r--package.json2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 893c0d9cf..9c6a06788 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
## 2.13.6 2016-10-26
- Add a check for improper Transaction data.
+- Inject up to date version of web3.js
- Now nicknaming new accounts "Account #" instead of "Wallet #" for clarity.
- Fix bug where custom provider selection could show duplicate items.
- Fix bug where connecting to a local morden node would make two providers appear selected.
diff --git a/package.json b/package.json
index 4e1b9e73b..7c6b60a4f 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
"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"