element-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 Update Inter font to v3.18 2021-04-09 17:41:54 +01:00
img Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-04-29 09:52:21 +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