aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/settings/settings.js
Commit message (Expand)AuthorAgeFilesLines
* Fix i18n merge conflictsAlexander Tseung2018-03-301-30/+73
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-291-1/+19
* Fix merge conflictsAlexander Tseung2018-03-271-28/+40
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-1/+1
* 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-151-0/+283