Merge branch 'master' into develop

danfinlay · danfinlay · commit fbcea7043f10 · 2018-06-01T15:47:28.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Current Master
 
+## 4.7.0 Wed May 30 2018
+
+- Fix Brave support
 - 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.
 - New unlock screen design.
diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.6.1",
+  "version": "4.7.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",
@@ -68,6 +68,8 @@
     "matches": [
       "https://metamask.io/*"
     ],
-    "ids": ["*"]
+    "ids": [
+      "*"
+    ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "__MSG_appName__",`
`3`	`3`	`"short_name": "__MSG_appName__",`
`4`		`- "version": "4.6.1",`
	`4`	`+ "version": "4.7.0",`
`5`	`5`	`"manifest_version": 2,`
`6`	`6`	`"author": "https://metamask.io",`
`7`	`7`	`"description": "__MSG_appDescription__",`
`@@ -68,6 +68,8 @@`
`68`	`68`	`"matches": [`
`69`	`69`	`"https://metamask.io/*"`
`70`	`70`	`],`
`71`		`- "ids": ["*"]`
	`71`	`+ "ids": [`
	`72`	`+ "*"`
	`73`	`+ ]`
`72`	`74`	`}`
`73`	`75`	`}`