Alexander Tseung 099f078a3d Fix merge conflict

2018-01-03 11:16:46 -08:00

..

accounts/import

…

components

Merge branch 'master' into NewUI-flat

2017-12-20 19:16:12 -03:30

css

Merge branch 'master' into NewUI-flat

2017-12-20 19:16:12 -03:30

first-time

…

img

…

keychains/hd

…

account-detail.js

…

add-token.js

…

app.js

Track usage of old and new UI (#2794)

2017-12-22 10:43:02 -08:00

conf-tx.js

…

config.js

Merge branch 'master' into NewUI-flat

2017-12-20 19:16:12 -03:30

info.js

…

infura-conversion.json

…

new-keychain.js

…

send.js

Fix merge conflict

2018-01-03 11:16:46 -08:00

settings.js

…

template.js

…

unlock.js

…

util.js

…