Merge pull request #647 from MetaMask/Version-2.11.0

danfinlay · web-flow · commit f70bb30d2c08 · 2016-09-12T15:51:44.000-07:00
Version 2.11.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+## 2.11.0 2016-09-12
+
 - Fix bug where pending transactions from Test net (or other networks) show up In Main net.
 - Add fiat conversion values to more views.
 - On fresh install, open a new tab with the MetaMask Introduction video. Does not open on update.
diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.10.2",
+  "version": "2.11.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": "2.10.2",`
	`4`	`+ "version": "2.11.0",`
`5`	`5`	`"manifest_version": 2,`
`6`	`6`	`"author": "https://metamask.io",`
`7`	`7`	`"description": "Ethereum Browser Extension",`