m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #10025 from MetaMask/sync-master

Browse Source 
Sync `master` with `develop`
This commit is contained in:
Mark Stacey 2020-12-09 02:08:50 -03:30 committed by GitHub
commit b7d9ed566a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
## Current Develop Branch
## 8.1.7 Tue Dec 08 2020
- Revert SES lockdown
## 8.1.6 Wed Dec 02 2020
- [#9916](https://github.com/MetaMask/metamask-extension/pull/9916): Fix QR code scans interpretting payment requests as token addresses
- [#9847](https://github.com/MetaMask/metamask-extension/pull/9847): Add alt text for images in list items

2
app/manifest/_base.json
View File

@ -77,6 +77,6 @@
"notifications"
],
"short_name": "__MSG_appName__",
"version": "8.1.6",
"version": "8.1.7",
"web_accessible_resources": ["inpage.js", "phishing.html"]
}