Diego Mello e1b774a745 Merge branch 'develop' into update-single-server ... # Conflicts: # android/app/build.gradle		2020-11-16 11:01:53 -03:00
..
project.pbxproj	Merge branch 'develop' into update-single-server	2020-11-16 11:01:53 -03:00