Michael Telatynski 02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 ... Conflicts: src/components/views/spaces/SpaceTreeLevel.tsx src/dispatcher/actions.ts src/i18n/strings/en_EN.json		2021-07-29 16:11:16 +01:00
..
_CallContextMenu.scss	…
_IconizedContextMenu.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093	2021-07-29 16:11:16 +01:00
_MessageContextMenu.scss	…
_StatusMessageContextMenu.scss	…
_TagTileContextMenu.scss	…