brunobar79 69f4c8c336 fix merge conflicts		2018-07-26 21:04:03 -04:00
..
_locales	Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional	2018-07-26 15:13:24 -07:00
fonts
images
scripts	fix merge conflicts	2018-07-26 21:04:03 -04:00
404.html
error.html
home.html
loading.html
manifest.json	working without permission issues	2018-07-26 20:24:39 -04:00
notification.html
popup.html
unsupport.html