aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2018-06-19 07:01:48 +0800
committerGitHub <noreply@github.com>2018-06-19 07:01:48 +0800
commit6bf09c0ffe39196ed97405001ee9a094d69a0da2 (patch)
tree338aaee17d433383c9a57b385489cbc8df3f82d0
parentd910c35e90d0d725e86b7743538b6c6c429f26f0 (diff)
parent4598554fea7b9435e5cbecc4735c479ffbadf37e (diff)
downloadtangerine-wallet-browser-6bf09c0ffe39196ed97405001ee9a094d69a0da2.tar
tangerine-wallet-browser-6bf09c0ffe39196ed97405001ee9a094d69a0da2.tar.gz
tangerine-wallet-browser-6bf09c0ffe39196ed97405001ee9a094d69a0da2.tar.bz2
tangerine-wallet-browser-6bf09c0ffe39196ed97405001ee9a094d69a0da2.tar.lz
tangerine-wallet-browser-6bf09c0ffe39196ed97405001ee9a094d69a0da2.tar.xz
tangerine-wallet-browser-6bf09c0ffe39196ed97405001ee9a094d69a0da2.tar.zst
tangerine-wallet-browser-6bf09c0ffe39196ed97405001ee9a094d69a0da2.zip
Merge pull request #4605 from MetaMask/master
Merge Master into Develop
-rw-r--r--CHANGELOG.md16
-rw-r--r--app/manifest.json2
2 files changed, 11 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43302548b..e6adc9534 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,16 @@
## Current Master
-- Attempting to import an empty private key will now show a clear error.
-- Fix bug where metamask data would stop being written to disk after prolonged use
-- Fix bug where account reset did not work with custom RPC providers.
-- Fix for Brave i18n getAcceptLanguages [#4270](https://github.com/MetaMask/metamask-extension/issues/4270)
-- Fix bug where nonce mutex was never released
-- Add phishing notice
+## 4.8.0 Thur Jun 14 2018
+
+- [#4513](https://github.com/MetaMask/metamask-extension/pull/4513): Attempting to import an empty private key will now show a clear error.
+- [#4570](https://github.com/MetaMask/metamask-extension/pull/4570): Fix bug where metamask data would stop being written to disk after prolonged use.
+- [#4523](https://github.com/MetaMask/metamask-extension/pull/4523): Fix bug where account reset did not work with custom RPC providers.
+- [#4524](https://github.com/MetaMask/metamask-extension/pull/4524): Fix for Brave i18n getAcceptLanguages.
+- [#4557](https://github.com/MetaMask/metamask-extension/pull/4557): Fix bug where nonce mutex was never released.
+- [#4558](https://github.com/MetaMask/metamask-extension/pull/4558): Stop reloading browser page on Ethereum network change.
+- [#4566](https://github.com/MetaMask/metamask-extension/pull/4566): Add phishing notice.
+- [#4591](https://github.com/MetaMask/metamask-extension/pull/4591): Allow Copying Token Addresses and link to Token on Etherscan.
## 4.7.4 Tue Jun 05 2018
diff --git a/app/manifest.json b/app/manifest.json
index e3a7fd963..50b7e3c53 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "4.7.4",
+ "version": "4.8.0",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",