aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-05-17 04:56:32 +0800
committerkumavis <aaron@kumavis.me>2018-05-17 04:56:32 +0800
commit44f31f9a7e212550914c7b354cdd8e69534990cb (patch)
treef55cd86d2c123becb2392112c2da953550e559d6 /app/scripts/metamask-controller.js
parent8e1cad5ff60a67117bd6802dce15345d7b2542a4 (diff)
parent76c8cb3d7b1cbd5b5a3e48fac4b08e44ad936850 (diff)
downloadtangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.gz
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.bz2
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.lz
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.xz
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.zst
tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.zip
Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a90acb4d5..a6b5d3453 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -355,7 +355,6 @@ module.exports = class MetamaskController extends EventEmitter {
submitPassword: nodeify(keyringController.submitPassword, keyringController),
// network management
- setNetworkEndpoints: nodeify(networkController.setNetworkEndpoints, networkController),
setProviderType: nodeify(networkController.setProviderType, networkController),
setCustomRpc: nodeify(this.setCustomRpc, this),