Chi Kei Chan bd99bc2e88 Merge branch 'master' into NewUI-flat		2017-10-03 16:02:58 -07:00
..
account-import-strategies
controllers	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
lib	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
migrations	Remove keyring controller from project	2017-09-22 14:38:40 -07:00
platforms	re-enabled x-metamask-origin for mascara	2017-09-27 16:14:58 -07:00
background.js	transactions: lint fixes and reveal status-update event for balance controller	2017-09-26 16:54:04 -07:00
chromereload.js
config.js	network - convert localhost from custom rpc to network type	2017-09-29 16:35:58 -07:00
contentscript.js	bug - fix event emitter mem leak warning	2017-09-21 17:37:30 -07:00
first-time-state.js
inpage.js
metamask-controller.js	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
notice-controller.js
popup-core.js
popup.js