aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/create-account/import-account/index.js
Commit message (Expand)AuthorAgeFilesLines
* Fix merge conflictsAlexander Tseung2018-03-311-8/+14
* Fix i18n merge conflictsAlexander Tseung2018-03-301-22/+16
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-291-1/+1
* Fix merge conflictsAlexander Tseung2018-03-271-5/+21
* Fix merge conflicts from uat-nextAlexander Tseung2018-02-011-1/+1
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-0/+80