David Baker 8ac62f8c12 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups		2018-10-29 16:20:45 +00:00
..
css	Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups	2018-10-29 16:20:45 +00:00
fonts	move default fonts over from riot-web	2018-04-12 00:24:51 +01:00
img	Merge pull request #2124 from matrix-org/dbkr/tombstone	2018-08-29 18:38:48 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Support for room upgrades	2018-08-17 14:54:43 +01:00