Michael Telatynski c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2		2020-05-27 09:45:38 +01:00
..
css	Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2	2020-05-27 09:45:38 +01:00
fonts	…
img	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider	2020-05-20 13:46:17 +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