Michael Telatynski 390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/dialogs/RoomUpgradeDialog.tsx src/components/views/dialogs/RoomUpgradeWarningDialog.tsx src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx		2021-07-21 10:46:41 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-21 10:46:41 +01:00
fonts	Update Twemoji fonts for Unicode Emoji 13.1	2021-07-19 10:45:26 +01:00
img	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile	2021-07-17 08:13:51 +02:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge branch 'develop' into gsouquet/message-bubbles-4635	2021-07-20 10:16:21 +02:00