Šimon Brandner 66a3b0fe5f Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>		2021-07-20 13:24:05 +02:00
..
css	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-07-20 13:24:05 +02:00
fonts	Update Inter font to v3.18	2021-04-09 17:41:54 +01:00
img	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-07-20 13:24:05 +02:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge branch 'develop' into gsouquet/message-bubbles-4635	2021-07-20 10:16:21 +02:00