Michael Telatynski 630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 ... Conflicts: src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx		2021-09-09 11:01:11 +01:00
..
structures	Merge pull request #6760 from matrix-org/t3chguy/fix/18528	2021-09-08 22:59:52 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798	2021-09-09 11:01:11 +01:00