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

Browse source

 Conflicts:

	src/components/views/rooms/EditMessageComposer.js

	src/components/views/rooms/SendMessageComposer.js

...

This commit is contained in:

Michael Telatynski 2021-05-24 21:57:38 +01:00

parent 86b6fc3473 7123abc122

commit d8acc0612a

441 changed files with 17399 additions and 5943 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

1333

src/components/views/rooms/EventTile.tsx Normal file

View file

File diff suppressed because it is too large Load diff