mirror of
https://github.com/element-hq/element-web
synced 2024-10-26 12:45:53 +03:00
Merge branch 'luke/refactor-pills' of github.com:matrix-org/matrix-react-sdk into luke/refactor-pills
Conflicts: src/components/views/elements/Pill.js
This commit is contained in:
commit
03aba64b97