Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 ... Conflicts: package.json yarn.lock		2021-06-14 21:39:06 +01:00
..
MemberList-test.js	…
RoomList-test.js	…
RoomSettings-test.js	…
SendMessageComposer-test.js	Update Enzyme adapter name	2021-06-09 11:57:29 +01:00