Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240

2021-06-28 21:00:36 -06:00

..

css

Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240

2021-06-28 21:00:36 -06: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/17731

2021-06-25 14:50:24 +01:00

media

move default ringtones over from riot-web

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

themes

Tile styling and early behaviour

2021-06-24 13:56:11 -06:00