Chi Kei Chan 5aecce908f Merge branch 'master' into NewUI-flat		2017-10-25 18:49:02 -07:00
..
account-import-strategies
controllers	Merge branch 'master' into NewUI-flat	2017-10-24 16:56:49 -07:00
lib	Sign Typed Request styling fixes	2017-10-25 18:05:52 -07:00
migrations
platforms	re-enabled x-metamask-origin for mascara	2017-09-27 16:14:58 -07:00
background.js	Add eth_signTypedData handler	2017-09-29 19:40:46 +03:00
chromereload.js
config.js	network - convert localhost from custom rpc to network type	2017-09-29 16:35:58 -07:00
contentscript.js	contentscript - fix inpage require and bundling	2017-10-12 12:51:48 -07:00
first-time-state.js
inpage.js	Resolving that ugly merge.	2017-10-25 15:45:26 -07:00
metamask-controller.js	Merge branch 'master' into NewUI-flat	2017-10-20 11:05:10 -07:00
notice-controller.js
popup-core.js
popup.js