Kevin Serrano ae8486d5cf Merge branch 'master' into new-currency-test		2017-08-29 16:36:19 -07:00
..
account-import-strategies
controllers	integrate infura currency	2017-08-29 16:36:05 -07:00
lib	Merge branch 'master' into inpage-provider-fixes	2017-08-28 11:29:47 -07:00
migrations	Make method return a number	2017-08-23 23:24:01 -07:00
platforms
background.js
chromereload.js
config.js
contentscript.js
first-time-state.js
inpage.js
keyring-controller.js
metamask-controller.js	integrate infura currency	2017-08-29 16:36:05 -07:00
notice-controller.js
popup-core.js
popup.js