mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-12 02:04:36 +03:00
Merge branch 'luke/fix-rte-md-mentions' of github.com:matrix-org/matrix-react-sdk into luke/fix-rte-md-mentions
Conflicts: src/components/views/rooms/MessageComposerInput.js
This commit is contained in:
commit
d080490ed3