Travis Ralston fd9241a854 Merge pull request #6355 from SimonBrandner/fix/diff-colors ... Make diff colors in codeblocks more pleasant		2021-07-21 20:02:03 -06:00
..
css	Merge pull request #6355 from SimonBrandner/fix/diff-colors	2021-07-21 20:02:03 -06:00
fonts	Update Twemoji fonts for Unicode Emoji 13.1	2021-07-19 10:45:26 +01:00
img	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile	2021-07-17 08:13:51 +02:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge pull request #6355 from SimonBrandner/fix/diff-colors	2021-07-21 20:02:03 -06:00