Dan Finlay a41e5788cf Merge branch 'master' into NewUI		2017-07-20 12:39:06 -07:00
..
account-import-strategies
controllers	transactions - block nonce-tracker while updating pending transactions	2017-07-18 15:27:15 -07:00
lib	transactions - block nonce-tracker while updating pending transactions	2017-07-18 15:27:15 -07:00
migrations	limit the range for retryCount	2017-07-12 20:01:07 -07:00
platforms
background.js	Began creating new UI template	2017-07-03 13:48:18 -07:00
blacklister.js	Add first version of phishing site warning	2017-07-12 13:09:20 -07:00
chromereload.js
config.js
contentscript.js
first-time-state.js
inpage.js
keyring-controller.js	Fix error message for invalid seed words.	2017-06-26 16:14:35 -07:00
metamask-controller.js	turn off auto faucet and remove file	2017-07-17 17:37:01 -04:00
notice-controller.js
popup-core.js	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
popup.js	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
responsive-core.js	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
responsive.js	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00