Michael Telatynski 60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete ...

 Conflicts:

	src/components/structures/LoggedInView.tsx

	src/components/views/rooms/BasicMessageComposer.tsx

	src/editor/autocomplete.ts

2021-05-11 10:59:22 +01:00

..

structures

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete

2021-05-11 10:59:22 +01:00

views

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete

2021-05-11 10:59:22 +01:00