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
..
ExtraTile-test.tsx.snap	Refactor ExtraTile to use functional components (#10191)	2023-02-23 11:57:37 +00:00
PinnedEventTile-test.tsx.snap	Update vector-im (#11526)	2023-09-05 08:09:36 +00:00
RoomHeader-test.tsx.snap	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72	2023-09-19 10:36:29 +01:00
RoomPreviewBar-test.tsx.snap	Notify users about denied access on ask-to-join rooms (#11480)	2023-09-07 08:07:43 +00:00
RoomTile-test.tsx.snap	Update vector-im (#11526)	2023-09-05 08:09:36 +00:00
ThirdPartyMemberInfo-test.tsx.snap	Simplify nodes on ThirdPartyMemberInfo (#10889)	2023-05-24 08:28:15 +00:00