Johannes Marbach 44d4de14c9 Merge branch 'develop' into germain-gg/notifications-labs ... # Conflicts: # src/i18n/strings/en_EN.json # test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap		2023-09-04 14:08:50 +02:00
..
__snapshots__	Merge branch 'develop' into germain-gg/notifications-labs	2023-09-04 14:08:50 +02:00
LegacyRoomHeaderButtons-test.tsx	Consume more imports from matrix-js-sdk/src/matrix (#11449)	2023-08-23 09:04:25 +00:00
PinnedMessagesCard-test.tsx	Consume more imports from matrix-js-sdk/src/matrix (#11449)	2023-08-23 09:04:25 +00:00
RoomSummaryCard-test.tsx	Improve randomString mock for better snapshots (#11375)	2023-08-09 09:39:48 +01:00
UserInfo-test.tsx	Switch to importing models/{event-timeline{,set},user,device,event-status} from main js-sdk export (#11368)	2023-08-08 07:16:04 +00:00
VerificationPanel-test.tsx	Switch to importing models/{event-timeline{,set},user,device,event-status} from main js-sdk export (#11368)	2023-08-08 07:16:04 +00:00