diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-10-12 11:03:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 11:03:01 +0800 |
| commit | 7f6b488c04e6ea12b2ef24ac936b6a236ad904c2 (patch) | |
| tree | 6dbec947089691c0dffd5febbe6e92c1f712e40f | |
| parent | 1bbc55a53379294a9d92a3648798b1a400050176 (diff) | |
| parent | f194f07801358099b9c6e69522528ed411611bc3 (diff) | |
| download | tangerine-wallet-browser-7f6b488c04e6ea12b2ef24ac936b6a236ad904c2.tar tangerine-wallet-browser-7f6b488c04e6ea12b2ef24ac936b6a236ad904c2.tar.gz tangerine-wallet-browser-7f6b488c04e6ea12b2ef24ac936b6a236ad904c2.tar.bz2 tangerine-wallet-browser-7f6b488c04e6ea12b2ef24ac936b6a236ad904c2.tar.lz tangerine-wallet-browser-7f6b488c04e6ea12b2ef24ac936b6a236ad904c2.tar.xz tangerine-wallet-browser-7f6b488c04e6ea12b2ef24ac936b6a236ad904c2.tar.zst tangerine-wallet-browser-7f6b488c04e6ea12b2ef24ac936b6a236ad904c2.zip | |
Merge pull request #5511 from MetaMask/merge-master
Merge master into develop (resolves merge conflict)
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | app/manifest.json | 2 |
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 +} |