Dan Finlay 152419a79b Merge branch 'master' into i328-MultiVault		2016-10-21 17:58:18 -07:00
..
integration	Fix tests	2016-10-20 12:07:53 -07:00
lib	Fix bug in new KeyringController vault restoring logic.	2016-10-21 13:11:30 -07:00
unit	Merge branch 'master' into i328-MultiVault	2016-10-21 17:58:18 -07:00
helper.js	Fix plugin tests	2016-04-18 11:31:06 -07:00