Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations

Browse Source

...

This commit is contained in:

Jaiwanth

2021-07-26 00:18:56 +05:30

parent 2487fe7380 869a5fb5c7

commit b04bfeda33

196 changed files with 5000 additions and 3423 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

+1753 -1765

File diff suppressed because it is too large Load Diff