Diego Mello 3ddbe6cc8e Merge branch 'develop' into single-server ... # Conflicts: # android/app/build.gradle # android/gradle.properties # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/RocketChatRN.xcodeproj/project.pbxproj		2020-12-15 15:38:04 -03:00
..
xcshareddata/xcschemes	[CHORE] Build official apps on CI (#2701)	2020-12-14 13:20:32 -03:00
project.pbxproj	Merge branch 'develop' into single-server	2020-12-15 15:38:04 -03:00