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

 Conflicts:

	package.json

	yarn.lock

2021-06-15 13:59:54 +01:00

..

MemberList-test.js

use Intl.Collator over String.prototype.localeCompare for better performance

2021-06-02 10:42:17 +01:00

RoomList-test.js

Remove react-beautiful-dnd

2021-06-01 17:35:31 +01:00

RoomSettings-test.js

Replace Riot with Element in docs and comments

2020-08-03 18:33:36 +01:00

SendMessageComposer-test.js

Update Enzyme adapter name

2021-06-09 11:57:29 +01:00