element-web-Github/res
Michael Telatynski 986d56ffdc Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
 Conflicts:
	src/components/views/rooms/RoomSublist2.tsx
	src/components/views/rooms/RoomTile2.tsx
2020-07-07 17:11:04 +01:00
..
css Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345 2020-07-07 17:11:04 +01:00
fonts fix emoji in safari 2020-06-04 22:01:16 +01:00
img add missing svg 2020-07-01 14:26:50 +01:00
media move default ringtones over from riot-web 2018-04-12 00:25:36 +01:00
themes Remove comment 2020-07-07 16:45:43 +01:00