Dan Finlay 77d2deb176 Merged master into dev

2016-12-19 13:37:27 -08:00

..

keyrings

…

lib

move notice code from metamask-controller + config-manager, in to notice-controller

2016-12-16 12:44:47 -08:00

migrations

…

background.js

…

chromereload.js

…

config.js

…

contentscript.js

…

inpage.js

Merged master into dev

2016-12-19 13:37:27 -08:00

keyring-controller.js

…

metamask-controller.js

Merged master into dev

2016-12-19 13:37:27 -08:00

notice-controller.js

move notice code from metamask-controller + config-manager, in to notice-controller

2016-12-16 12:44:47 -08:00

popup-core.js

…

popup.js

…