Michael Telatynski c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets ... Conflicts: src/components/views/right_panel/WidgetCard.tsx src/stores/WidgetStore.ts		2020-10-07 10:04:45 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets	2020-10-07 10:04:45 +01:00
fonts	use Inter as font	2020-06-30 13:28:19 +02:00
img	Add a note to use the desktop builds when seshat isn't available	2020-09-16 17:23:37 -06:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	fix index mismatch	2020-09-28 16:20:16 +02:00