Commit Graph

1 Commits

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