Merge branch 'master' of github.com:MetaMask/metamask-extension into develop

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a0baf65b..9cb8197d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@
 ## 4.12.0 Thursday September 27 2018
 
 - Reintroduces changes from 4.10.0
+## 4.13.0
+
+- A rollback release, equivalent to `v4.11.1` to be deployed in the case that `v4.12.0` is found to have bugs.
 
 ## 4.11.1 Tuesday September 25 2018
 
diff --git a/app/manifest.json b/app/manifest.json
index e223171d3..cd34a586d 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -77,4 +77,4 @@
       "*"
     ]
   }
-}
\ No newline at end of file
+}