From 5d93e8fa7433a55e8623039887f7d2032796b451 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 21 Jul 2016 13:42:09 -0700
Subject: [PATCH 1/5] Version 2.7.0

---
 CHANGELOG.md      | 2 ++
 app/manifest.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98cdb1c0e..d5cd49485 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+## 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.
diff --git a/app/manifest.json b/app/manifest.json
index 4cca79c72..88b097f5d 100644
--- 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": {

From c6ec3fc714f5ba7d232fcf61450da85f78b20caa Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 26 Jul 2016 17:02:31 -0700
Subject: [PATCH 2/5] Cleanup Changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91ee4d986..5900b2b7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,14 +3,15 @@
 ## Current Master
 
 - Fix bug where web3 would sometimes not be injected in time for the application.
+- Fixed bug where sometimes when opening the plugin, it would not fully open until closing and re-opening.
+- Got most functionality working within Firefox.
+
 ## 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.
 - Removed firefox-specific line in manifest.
-- Got most functionality working within Firefox.
-- Fixed bug where sometimes when opening the plugin, it would not fully open until closing and re-opening.
 
 ## 2.6.2 2016-07-20
 

From 7fe3170c6f5661f588dfbd8bbc074318522091a6 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 26 Jul 2016 17:02:54 -0700
Subject: [PATCH 3/5] Enhance manifest details

---
 app/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/manifest.json b/app/manifest.json
index 95aee245c..9f49d7b52 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,9 +1,9 @@
 {
-  "name": "__MSG_appName__",
+  "name": "MetaMask",
   "short_name": "Metamask",
   "version": "2.7.0",
   "manifest_version": 2,
-  "description": "__MSG_appDescription__",
+  "description": "Ethereum Browser Extension",
   "icons": {
     "16": "images/icon-16.png",
     "128": "images/icon-128.png"

From 0b620026c27bf07080c830f325fe14ffa12130e9 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 26 Jul 2016 17:13:52 -0700
Subject: [PATCH 4/5] Fix copy task

---
 gulpfile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 976671055..42554ca1a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -63,7 +63,6 @@ gulp.task('copy:chrome', gulp.series(
 copyTask({
   source: './dist/firefox',
   destination: './dist/chrome',
-  pattern: '**/*'
 }), 'manifest:cleanup'))
 gulp.task('copy',  gulp.series(gulp.parallel('copy:locales','copy:images','copy:fonts','copy:reload','copy:root'), 'copy:chrome'))
 gulp.task('copy:watch', function(){

From c759bc587166f4d1953653e3ef3bea359804256c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 26 Jul 2016 17:25:15 -0700
Subject: [PATCH 5/5] Correct typo comment

---
 gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 42554ca1a..c71ccb652 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -103,7 +103,7 @@ gulp.task('build:js:background', bundleTask({ watch: false, filename: 'backgroun
 gulp.task('build:js:popup', bundleTask({ watch: false, filename: 'popup.js' }))
 gulp.task('build:js',  gulp.parallel('build:js:inpage','build:js:contentscript','build:js:background','build:js:popup'))
 
-// clean dist/firefox
+// clean dist
 
 
 gulp.task('clean', function clean() {