Michael Telatynski e6ab18c9ba Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving ... Conflicts: src/components/views/rooms/RoomList.js		2020-01-16 00:31:43 +00:00
..
css	Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving	2020-01-16 00:31:43 +00:00
fonts	upgrade nunito from 3.500 to 3.504	2019-11-20 16:36:27 +00:00
img	Merge pull request #3821 from matrix-org/zip/11226-padlock-icons	2020-01-13 12:20:32 +00:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge pull request #3790 from justin-sleep/fix-dark-diff-highlighting	2020-01-05 17:08:38 -07:00