Frankie 97ea7454b3 Merge branch 'master' into networkController		2017-05-23 20:36:11 -04:00
..
account-import-strategies
controllers	Merge branch 'master' into networkController	2017-05-23 20:36:11 -04:00
lib	Merge branch 'master' into networkController	2017-05-23 20:36:11 -04:00
migrations
platforms
background.js
chromereload.js
config.js
contentscript.js
first-time-state.js	Fix for tests	2017-05-23 19:49:57 -04:00
inpage.js
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