frankiebee 751103d948 Merge branch 'master' into nonce-tracker		2017-07-12 15:10:58 -07:00
..
account-import-strategies	Fix linting warnings	2017-04-26 21:05:45 -07:00
controllers	mv updateAndApproveTx to txController	2017-07-12 15:07:56 -07:00
lib	Fix test to match behavior	2017-07-12 15:10:52 -07:00
migrations	migration 16 - move resubmit warning back to submitted state	2017-07-07 19:31:27 -07:00
platforms	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
background.js	Fix badge number to include personal_sign	2017-06-20 15:38:23 -07:00
chromereload.js	Fix console.error references	2016-08-29 17:32:39 -07:00
config.js	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
contentscript.js	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
first-time-state.js	default testnet - fix typo	2017-06-12 13:46:56 -07:00
inpage.js	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
keyring-controller.js	Fix error message for invalid seed words.	2017-06-26 16:14:35 -07:00
metamask-controller.js	Merge branch 'master' into nonce-tracker	2017-07-12 15:10:58 -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