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
..
androidTest/java/chat/rocket/reactnative	Merge 4.23.0 into single-server (#3575)	2021-12-24 10:12:49 -03:00
debug	Merge branch 'single-server' into single-server-4.30	2022-09-12 11:23:19 -03:00
e2e/res/xml	Merge 4.23.0 into single-server (#3575)	2021-12-24 10:12:49 -03:00
experimental	[CHORE] Build official apps on CI (#2701)	2020-12-14 13:20:32 -03:00
foss/java/chat/rocket/reactnative	[CHORE] Build official apps on CI (#2701)	2020-12-14 13:20:32 -03:00
main	[NEW] Use Inter font (#4459)	2022-08-23 16:32:51 -03:00
official	[FIX] Official app without sharedUserId (#2734)	2020-12-22 13:32:11 -03:00
play	Chore: Upgrade React Native to 0.68.2 (#4316)	2022-08-08 18:02:08 -03:00