Unverified Commit 492dd42f authored by Jorik Schellekens's avatar Jorik Schellekens Committed by GitHub

Merge pull request #13809 from JorikSchellekens/develop

Fix @types/react conflict in matrix-react-sdk
parents 29ff40ee 43c01481
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment