Michael Telatynski dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/elements/MiniAvatarUploader.tsx src/components/views/spaces/SpaceSettingsVisibilityTab.tsx src/i18n/strings/en_EN.json src/settings/handlers/RoomSettingsHandler.ts src/stores/SpaceStore.tsx		2021-07-15 10:04:48 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-15 10:04:48 +01:00
fonts	Update Inter font to v3.18	2021-04-09 17:41:54 +01:00
img	Add dialpad to transfer dialog + various dialpad UI improvements (#6363)	2021-07-15 09:55:58 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Add dialpad to transfer dialog + various dialpad UI improvements (#6363)	2021-07-15 09:55:58 +01:00