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
..
xcshareddata/xcschemes	feat: WatchOS app (#5476)	2024-04-26 17:33:11 -03:00
project.pbxproj	Merge branch 'single-server' into 4.48.0-single-server	2024-04-30 13:40:48 -03:00