Diego Mello 83d433a2d5 Merge branch 'single-server' into 4.48.0-single-server ... # Conflicts: # app/views/ChangeAvatarView/index.tsx # app/views/RoomsListView/Header/Header.tsx # ios/RocketChatRN.xcodeproj/project.pbxproj		2024-04-30 13:40:48 -03:00
..
MasterDetailStack	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
InsideStack.tsx	chore: Merge 4.47.0 into single-server (#5614)	2024-03-12 10:45:43 -03:00
OutsideStack.tsx	Merge branch 'single-server' into single-server-4.42.0	2023-10-19 11:09:06 -03:00
stackType.ts	chore: migrate AttachmentView to hooks (#5003)	2023-06-29 18:10:49 -03:00
types.ts	feat: mobile color normalization (#5616)	2024-04-18 07:19:54 -03:00