Merge pull request #13809 from JorikSchellekens/develop

Browse source

Fix @types/react conflict in matrix-react-sdk

...

This commit is contained in:

Jorik Schellekens 2020-05-26 16:12:46 +01:00 committed by GitHub

parent 29ff40eee5 43c0148123

commit 492dd42f4d

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

1 changed files with 558 additions and 500 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files

1058

yarn.lock

View file

File diff suppressed because it is too large Load diff