Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuild

2016-07-26 17:01:48 -07:00 · 2016-07-26 17:01:48 -07:00 · 407d2e884b
parent de5a2bf9bc 5d93e8fa74
commit 407d2e884b
2 changed files with 3 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,8 @@
 ## Current Master

 - Fix bug where web3 would sometimes not be injected in time for the application.
+## 2.7.0 2016-07-21
+
 - Added a Warning screen about storing ETH
 - Add buy Button!
 - MetaMask now throws descriptive errors when apps try to use synchronous web3 methods.
--- a/app/manifest.json
+++ b/app/manifest.json
@ -1,7 +1,7 @@
 {
  "name": "__MSG_appName__",
  "short_name": "Metamask",
-  "version": "2.6.2",
+  "version": "2.7.0",
  "manifest_version": 2,
  "description": "__MSG_appDescription__",
  "icons": {