Dan Finlay 352bb5cb39 Merge branch 'master' into dev		2017-02-15 15:49:04 -08:00
..
integration	Merge branch 'mapachurro-patch-1' of github.com:mapachurro/metamask-plugin into mapachurro-patch-1	2017-02-10 13:14:09 -08:00
lib	Adding additional migration state to account for moving data.	2017-02-15 11:15:33 -08:00
unit	Merge branch 'master' into dev	2017-02-15 15:49:04 -08:00
helper.js	Fix plugin tests	2016-04-18 11:31:06 -07:00