aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2017-04-28 06:38:51 +0800
committerGitHub <noreply@github.com>2017-04-28 06:38:51 +0800
commit6f17c996c22801cc5fbdc060b7365c2da1c3087f (patch)
tree60554dbe5eed0ed996c40b03b10d901e2f7dae20
parentd8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6 (diff)
parent6d1fe7845c3e74858bbc9c7181348153dfcd55e9 (diff)
downloadtangerine-wallet-browser-Version-3.6.0.tar
tangerine-wallet-browser-Version-3.6.0.tar.gz
tangerine-wallet-browser-Version-3.6.0.tar.bz2
tangerine-wallet-browser-Version-3.6.0.tar.lz
tangerine-wallet-browser-Version-3.6.0.tar.xz
tangerine-wallet-browser-Version-3.6.0.tar.zst
tangerine-wallet-browser-Version-3.6.0.zip
Merge pull request #1343 from MetaMask/Version-3.5.4v3.6.0Version-3.6.0
Version 3.6.0
-rw-r--r--CHANGELOG.md7
-rw-r--r--app/manifest.json2
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a093a9e4..e629e0bc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,15 @@
## Current Master
+## 3.6.0 2017-4-25
+
+- Add Rinkeby Test Network to our network list.
+
+## 3.5.4 2017-4-25
+
- Fix occasional nonce tracking issue.
- Fix bug where some events would not be emitted by web3.
- Fix bug where an error would be thrown when composing signatures for networks with large ID values.
-- Add Rinkeby Test Network to our network list.
## 3.5.3 2017-4-24
diff --git a/app/manifest.json b/app/manifest.json
index aeb47dfe3..d5f66173c 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "3.5.3",
+ "version": "3.6.0",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",