Diego Mello 6f64babbd6 Merge branch 'single-server' into single-server-4.30 ... # Conflicts: # app/containers/UIKit/HeaderButtons.js # app/views/RoomsListView/Header/Header.tsx # ios/RocketChatRN.xcodeproj/project.pbxproj # yarn.lock		2022-09-12 11:23:19 -03:00
..
xcshareddata/xcschemes	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00
project.pbxproj	Merge branch 'single-server' into single-server-4.30	2022-09-12 11:23:19 -03:00