Diego Mello 82a210dd05 Merge branch 'single-server' into 4.35.0-single-server ... # Conflicts: # ios/RocketChatRN.xcodeproj/project.pbxproj		2023-01-24 10:25:59 -03:00
..
java/chat/rocket/reactnative	[FIX] Flipper on Android (#4771)	2022-12-21 17:35:45 -03:00
res/xml	Merge branch 'develop' into single-server	2020-10-05 17:19:36 -03:00
AndroidManifest.xml	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00