Michael Telatynski 9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 ...

 Conflicts:

	src/components/views/dialogs/AddExistingToSpaceDialog.tsx

2021-04-28 22:49:36 +01:00

..

css

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628

2021-04-28 22:49:36 +01:00

fonts

Update Inter font to v3.18

2021-04-09 17:41:54 +01:00

img

Change symbol names

2021-04-28 09:29:31 -06:00

media

move default ringtones over from riot-web

2018-04-12 00:25:36 +01:00

themes

Add progress effect to playback waveform

2021-04-27 22:59:16 -06:00