Merge pull request #584 from MetaMask/shortcut-fix

Fixed prohibited shortcut combination.

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.

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"
       }
     }
   },