Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop		2020-01-09 14:15:09 -07:00
..
css	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
fonts	upgrade nunito from 3.500 to 3.504	2019-11-20 16:36:27 +00:00
img	Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids	2020-01-09 14:13:32 -07:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge pull request #3790 from justin-sleep/fix-dark-diff-highlighting	2020-01-05 17:08:38 -07:00