David Baker b82a893a79 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases		2020-06-05 16:00:43 +01:00
..
css	Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases	2020-06-05 16:00:43 +01:00
fonts	fix emoji in safari	2020-06-04 22:01:16 +01:00
img	Merge pull request #4695 from aaronraimist/center-headerbuttons	2020-06-04 00:36:23 +01:00
media
themes	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider	2020-05-07 18:01:20 +01:00