Merge pull request #665 from MetaMask/Version-2.12.0

Version 2.12.0

2 files changed, 5 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 862bf3d7e..959524c06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,13 @@
 
 ## Current Master
 
+## 2.12.0 2016-09-14
+
+- Add a QR button to the Account detail screen
 - Fixed bug where opening MetaMask could close a non-metamask popup.
 - Fixed memory leak that caused occasional crashes.
+- Fixed bug where some tx errors would block subsequent txs until the plugin was refreshed.
 
-- Add a QR button to the Account detail screen
 ## 2.11.1 2016-09-12
 
 - Fix bug that prevented caches from being cleared in Opera.
diff --git a/app/manifest.json b/app/manifest.json
index a21e0612a..fe4ecf4f0 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.11.1",
+  "version": "2.12.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",