Michael Telatynski 18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/stores/SpaceStore.tsx		2021-07-22 12:44:27 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-22 12:44:27 +01:00
fonts	…
img	…
media	…
themes	Merge pull request #6432 from matrix-org/travis/voice-messages/colours	2021-07-22 03:39:29 -06:00