Merge pull request #13809 from JorikSchellekens/develop

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
commit 492dd42f4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

1058
yarn.lock

File diff suppressed because it is too large Load Diff