diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-12-20 07:28:43 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-20 07:28:43 +0800 |
commit | f7eec0b282de511d54fd50f2c75d7371ca6f399d (patch) | |
tree | 7476af4926a4e27999086ee570e46c4f74621b84 /ui/app/config.js | |
parent | 1b6ee56cac34cd3544fd375cad342eb8240ae8aa (diff) | |
parent | 77d2deb17654b87dfd306b7f7cef335b1b511a8f (diff) | |
download | tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.gz tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.bz2 tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.lz tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.xz tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.zst tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.zip |
Merge pull request #936 from MetaMask/MergeMaster
Merge master
Diffstat (limited to 'ui/app/config.js')
-rw-r--r-- | ui/app/config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/config.js b/ui/app/config.js index 7e49cf048..3730baf6b 100644 --- a/ui/app/config.js +++ b/ui/app/config.js @@ -133,7 +133,7 @@ function currentProviderDisplay (metamaskState) { case 'testnet': title = 'Current Network' - value = 'Morden Test Network' + value = 'Ropsten Test Network' break default: |