Alexander Tseung ba23843f91 Fix merge conflicts		2018-03-30 16:18:48 -07:00
..
index.js	Removes t from props via metamask-connect and instead places it on context via a provider.	2018-03-29 12:42:38 -02:30