Alexander Tseung aa08d1a09d Fix merge conflicts

2018-01-16 18:34:24 -08:00

..

accounts/import

Use newui actions in old-ui

2017-12-04 23:08:23 -03:30

components

Merge branch 'master' into NewUI-flat

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

css

Merge branch 'uat' into uat-master-011618

2018-01-16 18:17:28 -08:00

first-time

Use newui actions in old-ui

2017-12-04 23:08:23 -03:30

img

Add old-ui directory

2017-12-04 23:06:26 -03:30

keychains/hd

Use newui actions in old-ui

2017-12-04 23:08:23 -03:30

account-detail.js

Merge branch 'uat' into uat-master-011618

2018-01-16 18:17:28 -08:00

add-token.js

Use newui actions in old-ui

2017-12-04 23:08:23 -03:30

app.js

Fix merge conflicts

2018-01-16 18:34:24 -08:00

conf-tx.js

Merge branch 'uat' into uat-master-011618

2018-01-16 18:17:28 -08:00

config.js

Merge branch 'master' into NewUI-flat

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

info.js

Use newui actions in old-ui

2017-12-04 23:08:23 -03:30

infura-conversion.json

Add old-ui directory

2017-12-04 23:06:26 -03:30

new-keychain.js

Add old-ui directory

2017-12-04 23:06:26 -03:30

send.js

Fix merge conflict

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

settings.js

Use newui actions in old-ui

2017-12-04 23:08:23 -03:30

template.js

Add old-ui directory

2017-12-04 23:06:26 -03:30

unlock.js

Use newui actions in old-ui

2017-12-04 23:08:23 -03:30

util.js

Add old-ui directory

2017-12-04 23:06:26 -03:30