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
..
structures	Escape placeholder before injecting it into the style (#11607)	2023-09-19 05:58:53 +00:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72	2023-09-19 10:36:29 +01:00