Michael Telatynski ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 ... Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts		2020-09-17 13:42:27 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180	2020-09-17 13:42:27 +01:00
fonts	use Inter as font	2020-06-30 13:28:19 +02:00
img	Update ellipsis svg	2020-09-09 13:09:21 +01: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