aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-02-10 10:41:01 +0800
committerGitHub <noreply@github.com>2017-02-10 10:41:01 +0800
commitd1a6b8c8ed023671d9d934be26921136f9af3756 (patch)
tree7eb792bc88a6b2c3425c54e56d358c24e7bf7e04
parent4033b620bd415421a5681cd9a6cd2c7e5ef8ff66 (diff)
parent2f6bf1c074fc49fd0354380c24e07eb9aa2a5ec2 (diff)
downloadtangerine-wallet-browser-d1a6b8c8ed023671d9d934be26921136f9af3756.tar.gz
tangerine-wallet-browser-d1a6b8c8ed023671d9d934be26921136f9af3756.tar.zst
tangerine-wallet-browser-d1a6b8c8ed023671d9d934be26921136f9af3756.zip
Merge branch 'dev' into i1085-synchronousnet
-rw-r--r--CHANGELOG.md7
-rw-r--r--app/manifest.json2
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccaa70370..1d1a2370b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,13 @@
# Changelog
## Current Master
-
- net_version has been made synchronous.
-## 3.2.0 2017-1-24
+## 3.2.1 2017-2-8
+
+- Fixed some build errors that were causing a variety of bugs.
+
+## 3.2.0 2017-2-8
- Add ability to import accounts in JSON file format (used by Mist, Geth, MyEtherWallet, and more!)
- Fix unapproved messages not being included in extension badge.
diff --git a/app/manifest.json b/app/manifest.json
index 8d6fb2ac4..c5d34e6ea 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "3.2.0",
+ "version": "3.2.1",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",