aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2019-05-15 03:39:44 +0800
committerGitHub <noreply@github.com>2019-05-15 03:39:44 +0800
commit985f51a764560311e8aa5bb149e34b3c25b78c92 (patch)
tree9c68af7d6cb4b10410d5deeb33b9c9b61996cd02
parente57ffbed593599cbf84d91144c7f208ee1298226 (diff)
parent3d715e5cf935ba0e2ced7caa8d8d0b26d3c983d4 (diff)
downloadtangerine-wallet-browser-985f51a764560311e8aa5bb149e34b3c25b78c92.tar
tangerine-wallet-browser-985f51a764560311e8aa5bb149e34b3c25b78c92.tar.gz
tangerine-wallet-browser-985f51a764560311e8aa5bb149e34b3c25b78c92.tar.bz2
tangerine-wallet-browser-985f51a764560311e8aa5bb149e34b3c25b78c92.tar.lz
tangerine-wallet-browser-985f51a764560311e8aa5bb149e34b3c25b78c92.tar.xz
tangerine-wallet-browser-985f51a764560311e8aa5bb149e34b3c25b78c92.tar.zst
tangerine-wallet-browser-985f51a764560311e8aa5bb149e34b3c25b78c92.zip
Merge pull request #6605 from MetaMask/Version-6.5.1v6.5.1
Version 6.5.1
-rw-r--r--CHANGELOG.md5
-rw-r--r--app/manifest.json2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46cb9e063..d3e333e23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
## Current Develop Branch
+## 6.5.1 Tue May 14 2019
+
+- Fix bug where approve method would show a warning. #6602
+- [#6593](https://github.com/MetaMask/metamask-extension/pull/6593): Fix wording of autoLogoutTimeLimitDescription
+
## 6.5.0 Fri May 10 2019
- [#6568](https://github.com/MetaMask/metamask-extension/pull/6568): feature: integrate gaba/PhishingController
diff --git a/app/manifest.json b/app/manifest.json
index 1d194a154..570e5b6cb 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "6.5.0",
+ "version": "6.5.1",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",