Diego Mello 2bdfdba027 Merge branch 'develop' into single-server ... # Conflicts: # ios/RocketChatRN.xcodeproj/project.pbxproj		2021-01-07 10:23:00 -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	2021-01-07 10:23:00 -03:00