Merge branch 'master' into develop-4.42.0

Browse Source

# Conflicts:
#	__tests__/containers/message/__snapshots__/Message.stories.storyshot
#	android/app/build.gradle
#	app/i18n/locales/en.json
#	app/i18n/locales/pt-BR.json
#	app/lib/methods/helpers/formatAttachmentUrl.ts
#	app/views/JitsiMeetView/index.tsx
#	app/views/RoomView/List/components/RefreshControl.tsx
#	app/views/RoomView/List/components/index.ts
#	app/views/RoomView/List/hooks/index.ts
#	app/views/RoomView/List/index.tsx
#	app/views/RoomsListView/index.tsx
#	e2e/tests/room/02-room.spec.ts
#	e2e/tests/room/05-threads.spec.ts
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json

...

This commit is contained in:

Diego Mello 2023-10-19 11:00:56 -03:00

parent 18b77ab4d6 ad8bef13d3

commit 360bc7a38b

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