Frankie a96f892788 Fix messy merge		2017-02-01 13:25:36 -08:00
..
account-import-strategies
keyrings
lib	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 12:03:42 -08:00
migrations	migration #6 - fix selectedAddress data source	2017-01-30 15:53:21 -08:00
background.js	Clean up message manger includes:	2017-01-28 20:28:20 -08:00
chromereload.js
config.js
contentscript.js
first-time-state.js
inpage.js	inpage - set web3.eth.defaultAccount correctly	2017-01-30 15:38:32 -08:00
keyring-controller.js	Fix messy merge	2017-02-01 13:25:36 -08:00
metamask-controller.js	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 13:05:58 -08:00
notice-controller.js
popup-core.js
popup.js
transaction-manager.js	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 12:03:42 -08:00