matrix-react-sdk into develop

Commit

9 years ago

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop Conflicts: src/i18n/strings/fr.json

References

Author

Weblate

Parents