Michael Telatynski c839123b83 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72 ... # Conflicts: # src/components/views/rooms/RoomHeader.tsx # test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap		2023-09-19 10:36:29 +01:00
..
CapabilityText.tsx	Migrate more strings to translation keys (#11606)	2023-09-14 18:47:29 +01:00
Jitsi.ts	Switch to importing client from main js-sdk export (#11370)	2023-08-09 07:18:41 +00:00
ManagedHybrid.ts	Handle ManagedHybrid widgets in useRoomCall and mark them in the widget state event	2023-09-11 11:39:30 +01:00
WidgetType.ts	Enable @typescript-eslint/explicit-member-accessibility on /src (#9785)	2022-12-16 12:29:59 +00:00