Merge pull request #1343 from MetaMask/Version-3.5.4

tmashuang · web-flow · commit 6f17c996c228 · 2017-04-27T15:38:51.000-07:00
Version 3.6.0
diff --git 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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "MetaMask",`
`3`	`3`	`"short_name": "Metamask",`
`4`		`- "version": "3.5.3",`
	`4`	`+ "version": "3.6.0",`
`5`	`5`	`"manifest_version": 2,`
`6`	`6`	`"author": "https://metamask.io",`
`7`	`7`	`"description": "Ethereum Browser Extension",`