Michael Telatynski 8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 ...

 Conflicts:

	src/components/structures/MessagePanel.tsx

	src/components/structures/ScrollPanel.tsx

	src/components/structures/TimelinePanel.tsx

	src/components/views/elements/ErrorBoundary.tsx

	src/components/views/elements/EventListSummary.tsx

	src/components/views/messages/TileErrorBoundary.tsx

2021-06-29 22:14:40 +01:00

..

auth

Auto-fix lint errors

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

avatars

Auto-fix lint errors

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

beta

Auto-fix lint errors

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

context_menus

Auto-fix more errors

2021-06-29 13:26:09 +01:00

dialogs

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8

2021-06-29 22:14:40 +01:00

directory

Fix long lines

2021-06-29 13:42:51 +01:00

elements

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8

2021-06-29 22:14:40 +01:00

emojipicker

Auto-fix lint errors

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

groups

Auto-fix more errors

2021-06-29 13:26:09 +01:00

host_signup

Auto-fix lint errors

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

messages

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8

2021-06-29 22:14:40 +01:00

right_panel

Auto-fix lint errors

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

room_settings

Auto-fix lint errors

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

rooms

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8

2021-06-29 22:14:40 +01:00

settings

Fix long lines

2021-06-29 13:42:51 +01:00

spaces

Auto-fix lint errors

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

terms

Auto-fix lint errors

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

toasts

Auto-fix lint errors

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

verification

Auto-fix lint errors

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

voice_messages

Auto-fix lint errors

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

voip

Auto-fix lint errors

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