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

 Conflicts:

	src/components/views/dialogs/InviteDialog.tsx

2021-06-03 16:22:59 +01:00

..

css

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

2021-06-03 16:22:59 +01:00

fonts

Update Inter font to v3.18

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

img

Remove logo spinner

2021-05-20 17:31:10 -04:00

media

move default ringtones over from riot-web

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

themes

Move and update variable usage

2021-05-05 14:00:56 -06:00