Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
| | | | | cb-254 | ||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 5 | -30/+57 |
| | |||||
* | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 5 | -47/+39 |
| | |||||
* | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 5 | -5/+5 |
| | |||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 5 | -102/+145 |
| | |||||
* | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 1 | -0/+6 |
| | | | | into cb-254 | ||||
* | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 3 | -13/+20 |
| | |||||
* | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 6 | -0/+475 |