Michael Telatynski 5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1 ... Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/messages/MImageBody.tsx		2021-07-23 10:42:46 +01:00
..
room	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1	2021-07-23 10:42:46 +01:00
user	Adhere to better eslint rules	2021-07-23 10:35:10 +01:00