aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-09-15 03:42:35 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-09-15 03:42:35 +0800
commit034742a571682514b1bf50a667118e4aea157ccd (patch)
tree7fe21b38ab326ff476cdec65ef1298ba700a00c3
parent8e7a9c470943b4cfe1e19f1682ee8521033ed2db (diff)
parentb2103cbec7d7c3cd1cf43b0baf76d2c9b559873d (diff)
downloadtangerine-wallet-browser-034742a571682514b1bf50a667118e4aea157ccd.tar
tangerine-wallet-browser-034742a571682514b1bf50a667118e4aea157ccd.tar.gz
tangerine-wallet-browser-034742a571682514b1bf50a667118e4aea157ccd.tar.bz2
tangerine-wallet-browser-034742a571682514b1bf50a667118e4aea157ccd.tar.lz
tangerine-wallet-browser-034742a571682514b1bf50a667118e4aea157ccd.tar.xz
tangerine-wallet-browser-034742a571682514b1bf50a667118e4aea157ccd.tar.zst
tangerine-wallet-browser-034742a571682514b1bf50a667118e4aea157ccd.zip
Merge branch 'master' into i#626
-rw-r--r--CHANGELOG.md5
-rw-r--r--app/manifest.json2
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd96ee0a2..c4438c3cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,13 @@
- Fixed bug where if you send a transaction from within MetaMask extension the
popup notification opens up.
+## 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",