diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-05-13 15:20:40 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-05-13 15:20:40 +0800 |
| commit | f2676d12413e379f3876e8e36b73478c66ed6ad0 (patch) | |
| tree | 7f5bdd29398adc5013d8785f89d4a86ab59dbd47 | |
| parent | 29facfe4d6194fe519c906983682a655f8fb6406 (diff) | |
| parent | 57d6ad2a3cc0e4f97181b7ce8466c8fc53735d25 (diff) | |
| download | tangerine-wallet-browser-f2676d12413e379f3876e8e36b73478c66ed6ad0.tar.gz tangerine-wallet-browser-f2676d12413e379f3876e8e36b73478c66ed6ad0.tar.zst tangerine-wallet-browser-f2676d12413e379f3876e8e36b73478c66ed6ad0.zip | |
Merge branch 'master' into eyeballs
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e592e1faf..d6f05795e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ - Replaced identicons with jazzicons - Fixed glitchy transitions +## 1.8.3 2016-05-12 + +- Bumped web3 to 0.6.0 +- Really fixed `eth_syncing` method response. + ## 1.8.2 2016-05-11 - Fixed bug where send view would not load correctly the first time it was visited per account. diff --git a/app/manifest.json b/app/manifest.json index 9288c3503..288c153c3 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "Metamask", - "version": "1.8.2", + "version": "1.8.3", "manifest_version": 2, "description": "__MSG_appDescription__", "icons": { diff --git a/package.json b/package.json index 00f5e55ef..15e4c853f 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "textarea-caret": "^3.0.1", "three.js": "^0.73.2", "through2": "^2.0.1", - "web3": "^0.15.1", + "web3": "ethereum/web3.js#0.16.0", "web3-provider-engine": "^7.6.3", "xtend": "^4.0.1" }, |