David Baker 8ccaf53d20 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-11-20 18:08:39 +00:00

..

css

Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-11-20 18:08:39 +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

Merge pull request #2235 from MaxwellKepler/develop

2018-11-16 13:25:40 -07:00