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

Browse Source

 Conflicts:

	src/i18n/strings/en_EN.json

	src/rageshake/submit-rageshake.ts

...

This commit is contained in:

Michael Telatynski

2020-07-21 22:22:28 +01:00

parent 63853d9de1 bcc6c96030

commit 70c81cc377

1182 changed files with 47388 additions and 27457 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

+2140 -1468

File diff suppressed because it is too large Load Diff