Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 2 | -39/+47 |
* | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 2 | -40/+84 |
* | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 2 | -9/+28 |
* | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 1 | -28/+40 |
* | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 3 | -4/+3 |
* | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 1 | -4/+10 |
* | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 3 | -0/+450 |