aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-07-12 11:44:22 +0800
committerDan Finlay <dan@danfinlay.com>2016-07-12 11:44:22 +0800
commitd9718d005ca8879dcf64346a47353d4866cff2a9 (patch)
tree9f24ca824ad0d57c0312aa59872956aa158cf7c7
parenta5bac9419ac2509912cc9f642157126e49b78c71 (diff)
parent45c64a0830e8c797ec585ef77c6ea1432639e3bd (diff)
downloadtangerine-wallet-browser-d9718d005ca8879dcf64346a47353d4866cff2a9.tar.gz
tangerine-wallet-browser-d9718d005ca8879dcf64346a47353d4866cff2a9.tar.zst
tangerine-wallet-browser-d9718d005ca8879dcf64346a47353d4866cff2a9.zip
Merge branch 'master' into FixSvgIcons
-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 72866a75c..08acdf9be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+## 2.6.0 2016-07-11
+
- Fix formatting of ETH balance
- Fix formatting of account details.
- Use web3 minified dist for faster inject times
diff --git a/app/manifest.json b/app/manifest.json
index ebeaf16f6..d0207ee0e 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "Metamask",
- "version": "2.5.0",
+ "version": "2.6.0",
"manifest_version": 2,
"description": "__MSG_appDescription__",
"icons": {