Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 ... Conflicts: src/components/structures/RoomView.tsx src/components/views/right_panel/UserInfo.tsx		2021-06-03 08:42:05 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606	2021-06-03 08:42:05 +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