Merge pull request #3458 from MetaMask/version-4.2.0

Version 4.2.0

CHANGELOG.md

@@ -2,17 +2,15 @@
 
 ## Current Master
 
-- Change Loose label to Imported.
+## 4.2.0 Tue Mar 06 2018
+
+- Replace "Loose" wording to "Imported".
+- Replace "Unlock" wording with "Log In".
 - Add Imported Account disclaimer.
 - Allow adding custom tokens to classic ui when balance is 0
 - Allow editing of symbol and decimal info when adding custom token in new-ui
 - NewUI shapeshift form can select all coins (not just BTC)
 - Add most of Microsoft Edge support.
-- Replace "Unlock" wording with "Log In".
-- Allow adding custom tokens to classic ui when balance is 0
-- Allow editing of symbol and decimal info when adding custom token in new-ui
-- new-ui shapeshift form can select all coins (not just BTC)
-- Classic ui and new-ui shapeshift forms show when coins are not available on shapeshift
 
 ## 4.1.3 2018-2-28
 

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
@@ -59,7 +59,7 @@
     "clipboardWrite",
     "http://localhost:8545/",
     "https://*.infura.io/"
-    ],
+  ],
   "web_accessible_resources": [
     "scripts/inpage.js"
   ],
@@ -68,4 +68,4 @@
       "https://metamask.io/*"
     ]
   }
-}
+}