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

 Conflicts:

	src/components/structures/SpaceRoomDirectory.tsx

2021-05-06 13:06:50 +01:00

..

css

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

2021-05-06 13:06:50 +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

Promote colour to a variable

2021-05-05 09:58:45 -06:00