Michael Telatynski e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 ... Conflicts: src/stores/SpaceStore.tsx		2021-06-22 17:38:05 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665	2021-06-22 17:38:05 +01:00
fonts	…
img	Merge branch 'develop' into fix/mute-incoming-call/15591	2021-06-04 07:59:28 +02:00
media	…
themes	…