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	…
auth	…
avatars	…
beta	…
context_menus	…
dialogs	…
directory	…
elements	…
emojipicker	…
groups	…
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	…
room_settings	…
rooms	…
settings	…
spaces	…
terms	…
toasts	…
verification	…
voip	…