9 Commits

Author	SHA1	Message	Date
Alexander Tseung	9e41f58af2	Clean up network config	2018-04-23 10:18:05 -07:00
Alexander Tseung	2fdf45b418	Show correct MetaMask version number in the Info page	2018-04-18 18:44:51 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
Alexander Tseung	58f52b2b8d	Fix merge conflicts. Refactor onboarding flow.	2018-03-28 13:23:50 -07:00
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
Alexander Tseung	0c6fef3dec	Add create new account routes, fix conflicts from uat updates	2018-01-31 18:08:49 -08:00
Alexander Tseung	ecc39c5a7a	Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254	2018-01-29 18:22:52 -08:00
Alexander Tseung	e226b10a89	Add react-router to allow use of the browser back button	2017-12-14 12:50:20 -08:00