Diego Mello 59bc3e8a46 Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # app/sagas/login.js		2020-11-09 18:33:57 -03:00
..
xcshareddata/xcschemes	[NEW] Push notification data privacy (#2213)	2020-07-28 10:43:43 -03:00
project.pbxproj	Merge branch 'develop' into single-server	2020-11-09 18:33:57 -03:00