Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 ... Conflicts: package.json yarn.lock		2021-06-14 21:39:06 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282	2021-06-14 21:39:06 +01:00
fonts	Update Inter font to v3.18	2021-04-09 17:41:54 +01:00
img	Add a pulse animation to the pinned messages indicator and move it	2021-05-25 13:07:39 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Move and update variable usage	2021-05-05 14:00:56 -06:00