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

 Conflicts:

	src/components/views/rooms/BasicMessageComposer.tsx

	src/editor/autocomplete.ts

2021-07-15 09:59:40 +01:00

..

AutocompleteProvider.tsx

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

2021-07-15 09:59:40 +01:00

Autocompleter.ts

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

CommandProvider.tsx

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

2021-07-15 09:59:40 +01:00

CommunityProvider.tsx

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

2021-07-15 09:59:40 +01:00

Components.tsx

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

DuckDuckGoProvider.tsx

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

2021-07-15 09:59:40 +01:00

EmojiProvider.tsx

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

2021-07-15 09:59:40 +01:00

NotifProvider.tsx

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

2021-07-15 09:59:40 +01:00

QueryMatcher.ts

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

RoomProvider.tsx

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

2021-07-15 09:59:40 +01:00

SpaceProvider.tsx

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

UserProvider.tsx

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

2021-07-15 09:59:40 +01:00