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 branch 'master' into develop

Browse Source
This commit is contained in:
Dan Finlay 2018-06-01 15:47:28 -07:00
commit fbcea7043f
2 changed files with 7 additions and 2 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 Master ## Current Master
## 4.7.0 Wed May 30 2018
- Fix Brave support
- Adds error messages when passwords don't match in onboarding flow. - Adds error messages when passwords don't match in onboarding flow.
- Adds modal notification if a retry in the process of being confirmed is dropped. - Adds modal notification if a retry in the process of being confirmed is dropped.
- New unlock screen design. - New unlock screen design.

6
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "__MSG_appName__", "name": "__MSG_appName__",
"short_name": "__MSG_appName__", "short_name": "__MSG_appName__",
"version": "4.6.1", "version": "4.7.0",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "__MSG_appDescription__", "description": "__MSG_appDescription__",
@ -68,6 +68,8 @@
"matches": [ "matches": [
"https://metamask.io/*" "https://metamask.io/*"
], ],
"ids": ["*"] "ids": [
"*"
]
} }
} }