Diego Mello eb2dff9db5 Merge branch 'single-server' into 4.40.0-single-server ... # Conflicts: # android/app/build.gradle # app/containers/UIKit/VideoConferenceBlock/components/StartACallActionSheet.tsx # app/lib/hooks/useVideoConf.tsx # app/lib/methods/search.ts # app/stacks/OutsideStack.tsx # app/views/JitsiMeetView.tsx # e2e/helpers/app.ts # e2e/tests/room/01-createroom.spec.ts # e2e/tests/room/02-room.spec.ts # ios/RocketChatRN.xcodeproj/project.pbxproj # ios/RocketChatRN/Info.plist # ios/ShareRocketChatRN/Info.plist # package.json # yarn.lock		2023-08-29 10:48:52 -03:00
..
src	Merge branch 'single-server' into 4.40.0-single-server	2023-08-29 10:48:52 -03:00
_BUCK	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00
build.gradle	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00
build_defs.bzl	regression: Rollback to React Native 0.69.8 (#5162)	2023-08-18 14:48:33 -03:00
proguard-rules.pro	[CHORE] Update to react-native 0.60.4 (#1095)	2019-08-07 10:51:34 -03:00