Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ... | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
* | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 4 | -24/+46 |
* | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 4 | -41/+33 |
* | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 4 | -4/+4 |
* | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 4 | -96/+138 |
* | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int... | Alexander Tseung | 2018-02-09 | 1 | -0/+6 |
* | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 2 | -8/+13 |
* | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 4 | -0/+299 |