aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-21 06:40:22 +0800
committerFrankie <frankie.diamond@gmail.com>2017-01-21 06:40:22 +0800
commitc587d0f7db718368356b22f28223403e02928b9f (patch)
treeb1a59563a0f193dcf4ef7a252bdc73bf85fb1a29
parent03c58343a333bde9e4204e7dd9d302fb67746837 (diff)
parent85b34e3f2b89df9e8fbacc99b7bb39de977319d5 (diff)
downloadtangerine-wallet-browser-c587d0f7db718368356b22f28223403e02928b9f.tar.gz
tangerine-wallet-browser-c587d0f7db718368356b22f28223403e02928b9f.tar.zst
tangerine-wallet-browser-c587d0f7db718368356b22f28223403e02928b9f.zip
Merge branch 'master' into upToDate
-rw-r--r--CHANGELOG.md3
-rw-r--r--app/manifest.json2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index adfec8be9..fa825e860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
## Current Master
- Add ability to import accounts in JSON file format (used by Mist, Geth, MyEtherWallet, and more!)
+## 3.1.1 2017-1-20
+
+- Fix HD wallet seed export
## 3.1.0 2017-1-18
diff --git a/app/manifest.json b/app/manifest.json
index 2f1ae9b25..c34b17e72 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "3.1.0",
+ "version": "3.1.1",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",