matrix-react-sdk

4876f4c4 - Merge pull request #3396 from matrix-org/bwindels/fix-formatbar-merge-error