diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-10-05 07:33:42 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-05 07:33:42 +0800 |
commit | ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd (patch) | |
tree | 8ca772797be9b3481063c97ed1772b0902d657de /app | |
parent | 4eafb7da2f2c6efdf5ae1530ff8301f0f7daa604 (diff) | |
parent | 43dd3a5d7233338e82800d8e547c8c9113051423 (diff) | |
download | tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.gz tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.bz2 tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.lz tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.xz tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.zst tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.zip |
Merge branch 'master' into SmallerCopiedButton
Diffstat (limited to 'app')
-rw-r--r-- | app/images/icon-32.png | bin | 0 -> 1730 bytes | |||
-rw-r--r-- | app/images/icon-64.png | bin | 0 -> 3573 bytes | |||
-rw-r--r-- | app/manifest.json | 5 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/images/icon-32.png b/app/images/icon-32.png Binary files differnew file mode 100644 index 000000000..f801ebb6b --- /dev/null +++ b/app/images/icon-32.png diff --git a/app/images/icon-64.png b/app/images/icon-64.png Binary files differnew file mode 100644 index 000000000..b3019ad65 --- /dev/null +++ b/app/images/icon-64.png diff --git a/app/manifest.json b/app/manifest.json index d6738a5fa..6f0eacf77 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -10,7 +10,7 @@ "suggested_key": { "windows": "Alt+Shift+M", "mac": "Alt+Shift+M", - "chromeos": "Search+M", + "chromeos": "Alt+Shift+M", "linux": "Alt+Shift+M" } } @@ -55,9 +55,10 @@ } ], "permissions": [ - "notifications", "storage", "tabs", + "clipboardWrite", + "clipboardRead", "http://localhost:8545/" ], "web_accessible_resources": [ |