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

Browse Source

 Conflicts:

	package.json

...

This commit is contained in:

Michael Telatynski

2020-08-03 12:54:06 +01:00

parent a0e7efd7d5 05a30b8eab

commit cbcac9dd49

321 changed files with 9161 additions and 4040 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

+1001 -803

File diff suppressed because it is too large Load Diff