diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
commit | 69f4c8c336a0f2fad2027c4a5f76e28a976b5e75 (patch) | |
tree | c34647abca3a765d525e222855a7a93f4658f800 /CHANGELOG.md | |
parent | d4a15f22c24074f44daa9eeb4fda192ea3742792 (diff) | |
parent | e715d0e6915a9bb0ac69db06144253ddff54ba44 (diff) | |
download | tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.gz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.bz2 tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.lz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.xz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.zst tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.zip |
fix merge conflicts
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b2d78b6b1..7e1e1ff4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add Trezor Support - Allow to remove accounts (Imported and Hardware Wallets) - [#4840](https://github.com/MetaMask/metamask-extension/pull/4840): Now shows notifications when transactions are completed. +- [#4855](https://github.com/MetaMask/metamask-extension/pull/4855): network.js: convert rpc protocol to lower case. ## 4.8.0 Thur Jun 14 2018 |