Dan Finlay a741cc4fc4 Merge branch 'master' into AddTokenList		2017-06-12 17:17:16 -07:00
..
account-import-strategies	Fix linting warnings	2017-04-26 21:05:45 -07:00
controllers	Merge branch 'master' into AddTokenList	2017-06-12 17:17:16 -07:00
lib	Linting	2017-06-12 11:08:32 -07:00
migrations	Add a migration for the network controller	2017-05-23 01:55:20 -04:00
platforms	…
background.js	Linting	2017-06-12 11:08:32 -07:00
chromereload.js	…
config.js	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
contentscript.js	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
first-time-state.js	default testnet - fix typo	2017-06-12 13:46:56 -07:00
inpage.js	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
keyring-controller.js	Wrap the provider in a proxy	2017-05-23 01:56:10 -04:00
metamask-controller.js	include ethQuery in txController	2017-05-23 20:06:19 -04:00
notice-controller.js	…
popup-core.js	deps - use stream-subprovider from provider-engine	2017-05-22 15:59:07 -07:00
popup.js	Fix linting warnings	2017-04-26 21:05:45 -07:00