Frankie 6f7c23fd28 Merge branch 'dev' into TxManager		2016-12-21 14:31:07 -08:00
..
keyrings
lib	Merge branch 'dev' into TxManager	2016-12-21 14:31:07 -08:00
migrations
background.js
chromereload.js
config.js
contentscript.js
inpage.js
keyring-controller.js	Merge branch 'dev' into TxManager	2016-12-21 14:31:07 -08:00
metamask-controller.js	Merge branch 'dev' into TxManager	2016-12-21 14:31:07 -08:00
notice-controller.js
popup-core.js
popup.js
transaction-manager.js