Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: res/css/structures/_SpaceRoomView.scss src/components/structures/SpaceRoomView.tsx		2021-04-29 09:52:21 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-04-29 09:52:21 +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/17021	2021-04-29 09:52:21 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Add progress effect to playback waveform	2021-04-27 22:59:16 -06:00