Merge branch 'master' into 4.40.0-master

Browse Source

# Conflicts:
#	android/app/build.gradle
#	app/containers/UIKit/VideoConferenceBlock/components/StartACallActionSheet.tsx
#	app/lib/hooks/useVideoConf.tsx
#	app/lib/methods/search.ts
#	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

...

This commit is contained in:

Diego Mello 2023-08-29 10:36:06 -03:00

parent 25c3f46750 d643f132db

commit e32b37c294

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available