aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-12-21 03:48:15 +0800
committerGitHub <noreply@github.com>2016-12-21 03:48:15 +0800
commit35d8f69e807df6ec84f46d14db4454494d40f299 (patch)
treeffe4bd4c84633c8534caf43853db7ad36b7e52e5
parentead8329877c5441f32ab389adb41689086a38608 (diff)
parent3f2945dce0a619c41bfc519c23fa86bd38bf6202 (diff)
downloadtangerine-wallet-browser-35d8f69e807df6ec84f46d14db4454494d40f299.tar
tangerine-wallet-browser-35d8f69e807df6ec84f46d14db4454494d40f299.tar.gz
tangerine-wallet-browser-35d8f69e807df6ec84f46d14db4454494d40f299.tar.bz2
tangerine-wallet-browser-35d8f69e807df6ec84f46d14db4454494d40f299.tar.lz
tangerine-wallet-browser-35d8f69e807df6ec84f46d14db4454494d40f299.tar.xz
tangerine-wallet-browser-35d8f69e807df6ec84f46d14db4454494d40f299.tar.zst
tangerine-wallet-browser-35d8f69e807df6ec84f46d14db4454494d40f299.zip
Merge pull request #942 from MetaMask/Version-2.14.1
Version 2.14.1
-rw-r--r--CHANGELOG.md2
-rw-r--r--app/manifest.json2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c9cfc782..d0f22779c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+## 2.14.1 2016-12-20
+
- Temporarily disable extension reload detection causing infinite reload bug.
## 2.14.0 2016-12-16
diff --git a/app/manifest.json b/app/manifest.json
index f53c3b8b1..61775ed93 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "2.14.0",
+ "version": "2.14.1",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",