diff options
| author | Bruno Barbieri <bruno.barbieri@consensys.net> | 2018-09-25 23:58:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 23:58:43 +0800 |
| commit | ed3529b70b841dcec73c4b1e9986b06287344c05 (patch) | |
| tree | f81ea7de40b80e0fb2f58e33280e9e21f7e9d82f | |
| parent | e1c6306f838177249b96ab20882968f521a5b59f (diff) | |
| parent | bef7d7a867a5a5c7e228e39ca2c3231fa5c504b7 (diff) | |
| download | tangerine-wallet-browser-ed3529b70b841dcec73c4b1e9986b06287344c05.tar tangerine-wallet-browser-ed3529b70b841dcec73c4b1e9986b06287344c05.tar.gz tangerine-wallet-browser-ed3529b70b841dcec73c4b1e9986b06287344c05.tar.bz2 tangerine-wallet-browser-ed3529b70b841dcec73c4b1e9986b06287344c05.tar.lz tangerine-wallet-browser-ed3529b70b841dcec73c4b1e9986b06287344c05.tar.xz tangerine-wallet-browser-ed3529b70b841dcec73c4b1e9986b06287344c05.tar.zst tangerine-wallet-browser-ed3529b70b841dcec73c4b1e9986b06287344c05.zip | |
Merge branch 'master' into v4.11.1
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c61d566b4..66cc571e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Current Develop Branch +## 4.11.0 + +- Identical to 4.9.3. A rollback version to give time to fix bugs in the 4.10.x branch. + ## 4.9.3 Wed Aug 15 2018 - (#4897)[https://github.com/MetaMask/metamask-extension/pull/4897]: QR code scan for recipient addresses. diff --git a/app/manifest.json b/app/manifest.json index 23085e1fd..655c9ed10 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -78,4 +78,4 @@ "*" ] } -} +}
\ No newline at end of file |