mirror of
https://github.com/vector-im/element-web.git
synced 2025-11-30 15:01:43 +01:00
Conflicts: src/components/views/avatars/BaseAvatar.js test/components/views/messages/TextualBody-test.js
Conflicts: src/components/views/avatars/BaseAvatar.js test/components/views/messages/TextualBody-test.js