aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-08-25 09:56:42 +0800
committerGitHub <noreply@github.com>2016-08-25 09:56:42 +0800
commit2faf3f70631be2ef12cb004f5e890ec453df8169 (patch)
treef80f0732fd18af3ccdf4e84bd1f257d9cc2b2c1b
parent4448b635b9246103b59fecc617bcee806d66712c (diff)
parenta9b390c58c5fe3abe92ed3d33fd4d8cb74ff3cce (diff)
downloadtangerine-wallet-browser-2faf3f70631be2ef12cb004f5e890ec453df8169.tar
tangerine-wallet-browser-2faf3f70631be2ef12cb004f5e890ec453df8169.tar.gz
tangerine-wallet-browser-2faf3f70631be2ef12cb004f5e890ec453df8169.tar.bz2
tangerine-wallet-browser-2faf3f70631be2ef12cb004f5e890ec453df8169.tar.lz
tangerine-wallet-browser-2faf3f70631be2ef12cb004f5e890ec453df8169.tar.xz
tangerine-wallet-browser-2faf3f70631be2ef12cb004f5e890ec453df8169.tar.zst
tangerine-wallet-browser-2faf3f70631be2ef12cb004f5e890ec453df8169.zip
Merge pull request #584 from MetaMask/shortcut-fix
Fixed prohibited shortcut combination.
-rw-r--r--CHANGELOG.md5
-rw-r--r--app/manifest.json10
2 files changed, 10 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee155f6ba..5e6bc5299 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
## Current Master
+## 2.9.2 2016-08-24
+
+- Fixed shortcut bug from preventing installation.
+
+
## 2.9.1 2016-08-24
- Added static image as fallback for when WebGL isn't supported.
diff --git a/app/manifest.json b/app/manifest.json
index 96b5879e2..e5e08c4b6 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,16 +1,16 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "2.9.1",
+ "version": "2.9.2",
"manifest_version": 2,
"description": "Ethereum Browser Extension",
"commands": {
"_execute_browser_action": {
"suggested_key": {
- "windows": "Ctrl+Alt+M",
- "mac": "Command+Alt+M",
- "chromeos": "Ctrl+Alt+M",
- "linux": "Ctrl+Alt+M"
+ "windows": "Alt+Shift+M",
+ "mac": "Alt+Shift+M",
+ "chromeos": "Search+M",
+ "linux": "Alt+Shift+M"
}
}
},