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 /app/scripts/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 'app/scripts/config.js')
| -rw-r--r-- | app/scripts/config.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js index 9a0f2a50b..e09206c5f 100644 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -1,6 +1,5 @@ const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask' const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask' -const MORDEN_RPC_URL = 'https://morden.infura.io/metamask' const DEFAULT_RPC_URL = TESTNET_RPC_URL global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' @@ -11,6 +10,6 @@ module.exports = { default: DEFAULT_RPC_URL, mainnet: MAINET_RPC_URL, testnet: TESTNET_RPC_URL, - morden: MORDEN_RPC_URL, + morden: TESTNET_RPC_URL, }, } |