2 Commits (be8dce818e27dbbf5aeca2e5e225435a4ae0794b)

Author	SHA1	Message	Date
Severiano Jaramillo	37ace257bd	Migrate app to AndroidX and solve a bunch of conflicts.	2018-11-29 12:20:25 -06:00
dtvv	b6a9e6b59c	Add new Tab called “Merchants” and inside it should be “Comming soon” text	2018-09-18 12:45:01 -05:00