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

 Conflicts:

	src/components/views/room_settings/AliasSettings.tsx

2021-06-22 22:02:09 +01:00

..

css

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

2021-06-22 22:02:09 +01:00

fonts

Update Inter font to v3.18

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

img

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

2021-06-22 22:02:09 +01:00

media

…

themes

Move and update variable usage

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