Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 ... Conflicts: src/components/structures/ScrollPanel.js src/components/views/rooms/AppsDrawer.js		2020-09-07 14:33:57 +01:00
..
css	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785	2020-09-07 14:33:57 +01:00
fonts	use Inter as font	2020-06-30 13:28:19 +02:00
img	Update home icon	2020-08-27 13:18:52 -06:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Add a personal group for an all-communities state	2020-08-21 18:19:29 -06:00