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

Browse Source

 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

...

This commit is contained in:

Michael Telatynski

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

parent 660a849cdd e3201eb20f

commit 1f337b28ac

793 changed files with 13366 additions and 10246 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

yarn.lock

+298 -771

File diff suppressed because it is too large Load Diff