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
..
Header.tsx	Merge branch 'single-server' into single-server-4.30	2022-09-12 11:23:19 -03:00
index.tsx	[IMPROVE] Use UI Elements from react-navigation (#4314)	2022-07-06 10:23:02 -03:00