Kevin Serrano 1e9c0a9db2 Resolve merge conflicts		2017-10-26 16:22:08 -07:00
..
account-import-strategies	Fix linting warnings	2017-04-26 21:05:45 -07:00
controllers	Merge pull request #2422 from watilde/fixes-lint	2017-10-24 16:53:54 -07:00
lib	Fix lint warnings	2017-10-21 21:06:39 +02:00
migrations	Remove keyring controller from project	2017-09-22 14:38:40 -07:00
platforms	Make the function callback friendly.	2017-10-10 08:36:15 -07:00
background.js	Add eth_signTypedData handler	2017-09-29 19:40:46 +03:00
chromereload.js	Fix console.error references	2016-08-29 17:32:39 -07:00
config.js	network - convert localhost from custom rpc to network type	2017-09-29 16:35:58 -07:00
contentscript.js	contentscript - fix inpage require and bundling	2017-10-12 12:51:48 -07:00
first-time-state.js	default testnet - fix typo	2017-06-12 13:46:56 -07:00
inpage.js	Resolving that ugly merge.	2017-10-25 15:45:26 -07:00
metamask-controller.js	Linted	2017-10-19 12:33:43 -07:00
notice-controller.js	Remove notice body after reading.	2017-03-23 09:58:57 -04:00
popup-core.js	deps - use stream-subprovider from provider-engine	2017-05-22 15:59:07 -07:00
popup.js	Fix linting warnings	2017-04-26 21:05:45 -07:00