aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/settings
Commit message (Expand)AuthorAgeFilesLines
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-292-9/+28
* Fix merge conflictsAlexander Tseung2018-03-271-28/+40
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-013-4/+3
* Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-4/+10
* Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-153-0/+450