Michael Telatynski ae65ed5c2e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer ...

 Conflicts:

	res/css/views/rooms/_AppsDrawer.scss

2020-08-20 10:26:35 +01:00

..

css

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer

2020-08-20 10:26:35 +01:00

fonts

use Inter as font

2020-06-30 13:28:19 +02:00

img

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617

2020-08-14 18:58:26 +01:00

media

move default ringtones over from riot-web

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

themes

Change highlighting around the room list filter

2020-08-17 16:59:29 +01:00