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

..

structures

Room header UI updates (#11507)

2023-09-01 09:45:50 +00:00

views

Merge branch 'develop' into germain-gg/notifications-labs

2023-09-04 14:08:50 +02:00