brunobar79 3837c2ddd7 fix merge conflicts

2018-07-03 15:41:18 -04:00

..

import-account

Merge pull request #4716 from MetaMask/i4663-clearErrorMessages

2018-07-03 16:03:55 -02:30

connect-hardware.js

move hardcoded strings to localization file

2018-07-02 15:16:05 -04:00

index.js

fix merge conflicts

2018-07-03 13:31:30 -04:00

new-account.js

initial trezor support

2018-06-10 03:52:32 -04:00