Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash ...

 Conflicts:

	src/ContentMessages.tsx

	src/components/structures/UploadBar.tsx

	src/components/views/messages/MImageBody.js

	src/components/views/messages/MStickerBody.js

	src/components/views/messages/MVideoBody.tsx

2021-07-01 20:48:34 +01:00

..

audio_messages

lint

2021-06-30 14:51:18 -06: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

Never mind, it wasn't even used

2021-07-01 14:55:00 +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 travis/blurhash

2021-07-01 20:48:34 +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 travis/blurhash

2021-07-01 20:48:34 +01:00

right_panel

Remove unused prop

2021-07-01 14:03:01 +01:00

room_settings

Auto-fix lint errors

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

rooms

Remove rateLimitedFunc

2021-07-01 18:35:38 +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

lint

2021-07-01 15:11:18 +01:00

verification

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