Michael Telatynski a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage ... Conflicts: src/components/views/elements/AccessibleTooltipButton.tsx		2020-07-16 15:47:12 +01:00
..
css	Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage	2020-07-16 15:47:12 +01:00
fonts	use Inter as font	2020-06-30 13:28:19 +02:00
img	Update the SVGs with 24x24 fixed Figma ones	2020-07-16 15:30:06 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Add shadow to the reply preview and autocomplete composer panes	2020-07-16 15:26:25 +01:00