Michael Telatynski f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ...

 Conflicts:

	src/SlashCommands.tsx

	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx

	src/createRoom.ts

2021-07-09 08:13:39 +01:00

13 KiB

Raw Blame History

View Raw