brunobar79 992e7f1b5a fix merge conflicts		2018-08-17 12:56:07 -04:00
..
transactions	fix merge conflicts	2018-08-17 12:56:07 -04:00
address-book-controller.js	eslint --fix .	2018-07-02 18:49:33 -04:00
blacklist-controller-test.js
currency-controller-test.js	fix merge conflicts	2018-08-17 12:56:07 -04:00
detect-tokens-test.js	fix merge conflicts	2018-08-17 12:56:07 -04:00
infura-controller-test.js
metamask-controller-test.js	fix merge conflicts	2018-08-17 12:56:07 -04:00
network-contoller-test.js	fix merge conflicts	2018-08-17 12:56:07 -04:00
notice-controller-test.js	notices - replace getLatestNotice with getNextNotice	2018-06-13 23:30:31 -07:00
preferences-controller-test.js	create tokens storage when setadresses	2018-07-30 19:09:17 -04:00
token-rates-controller.js