Kevin Serrano 16ba2e6a30 Merge branch 'master' into new-currency-test		2017-09-26 09:51:20 -07:00
..
account-import-strategies
controllers	Comply with current currency API and add additional styling.	2017-09-18 16:09:01 -07:00
lib	Do not mark a retry tx failed that has been broadcast successfully	2017-09-18 14:34:25 -07:00
migrations
platforms
background.js	debug - prefer logger over console	2017-09-13 10:28:29 -07:00
chromereload.js
config.js
contentscript.js	contentscript - fix obj-multiplex instantiation and use pump for streams	2017-09-11 14:30:30 -07:00
first-time-state.js
inpage.js
keyring-controller.js	Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.	2017-09-21 15:47:25 -07:00
metamask-controller.js	Define encryptor in constructor params instead of platform object	2017-09-22 13:25:08 -07:00
notice-controller.js
popup-core.js
popup.js