aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-05-14 09:15:07 +0800
committerkumavis <aaron@kumavis.me>2016-05-14 09:15:07 +0800
commitdd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba (patch)
treec563eb62193582e0057751b0b330d44c4f892f5a /app
parent49e08f9013572e7168f258000ae20b35f337f969 (diff)
parent7f77fe1a790fbd466b91f5a8f6bf25fbd0982ae4 (diff)
downloadtangerine-wallet-browser-dd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba.tar
tangerine-wallet-browser-dd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba.tar.gz
tangerine-wallet-browser-dd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba.tar.bz2
tangerine-wallet-browser-dd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba.tar.lz
tangerine-wallet-browser-dd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba.tar.xz
tangerine-wallet-browser-dd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba.tar.zst
tangerine-wallet-browser-dd46ce79fd4f5337f9160f6105d0fbc6cb7ff2ba.zip
Merge branch 'master' into eyeballs
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/lib/config-manager.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/manifest.json b/app/manifest.json
index 288c153c3..d9697627f 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "Metamask",
- "version": "1.8.3",
+ "version": "1.8.4",
"manifest_version": 2,
"description": "__MSG_appDescription__",
"icons": {
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index fd48432b5..3c9326db9 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -2,8 +2,8 @@ const Migrator = require('pojo-migrator')
const extend = require('xtend')
const STORAGE_KEY = 'metamask-config'
-const TESTNET_RPC = 'http://morden.infura.io'
-const MAINNET_RPC = 'http://mainnet.infura.io/'
+const TESTNET_RPC = 'https://morden.infura.io'
+const MAINNET_RPC = 'https://mainnet.infura.io/'
const migrations = require('./migrations')