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	Migrate more strings to translation keys (#11512)	2023-09-04 10:20:34 +01:00
utils	Add Voice and Video call in room header (#11444)	2023-08-23 14:13:40 +00:00
views	Merge branch 'develop' into germain-gg/notifications-labs	2023-09-04 14:08:50 +02:00