Frances Pangilinan 9e1c90eafc fix merge		2016-12-21 14:46:10 -08:00
..
keyrings	Made changes according to feedback.	2016-12-19 19:32:59 -08:00
lib	Merge branch 'dev' into TxManager	2016-12-21 14:31:07 -08:00
migrations
background.js	Migrate all tx mutation code out of keyring controller and	2016-12-21 13:41:49 -08:00
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	fix merge	2016-12-21 14:46:10 -08:00
notice-controller.js	Lint.	2016-12-20 16:45:22 -08:00
popup-core.js
popup.js
transaction-manager.js	Migrate all tx mutation code out of keyring controller and	2016-12-21 13:41:49 -08:00