riot-web/res
Michael Telatynski df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179
 Conflicts:
	src/i18n/strings/en_EN.json
2021-05-11 14:07:47 +01:00
..
css Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 2021-05-11 14:07:47 +01:00
fonts
img
media
themes