Dan Finlay ba254d9041 Merge branch 'master' into currency-fix		2017-06-12 10:32:54 -07:00
..
account-import-strategies
controllers	Use new URL for currency API from cryptonator.	2017-06-05 16:23:56 -07:00
lib	Update gasblocklimit params with every block.	2017-06-02 15:18:14 -07:00
migrations
platforms
background.js
chromereload.js
config.js
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	Fix for tests	2017-05-23 19:49:57 -04: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
popup.js