Šimon Brandner 27ec3af03a Merge branch 'develop' into feed ... Looking forward to merging again! :D Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>		2021-04-03 09:15:55 +02:00
..
css	Merge branch 'develop' into feed	2021-04-03 09:15:55 +02:00
fonts	use Inter as font	2020-06-30 13:28:19 +02:00
img	Merge pull request #5789 from matrix-org/t3chguy/spaces4.11	2021-03-25 09:02:11 +00:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge branch 'develop' into travis/voice-messages/waveform	2021-03-29 22:59:51 -06:00