brunobar79 3290421e2f fix merge conflicts		2018-07-03 13:31:30 -04:00
..
import-account	Merge branch 'develop' into handle-import-account-failure-in-ui	2018-06-03 06:46:45 -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