mirror of https://github.com/vector-im/riot-web
880e16aaa2
Conflicts: src/components/views/avatars/BaseAvatar.js test/components/views/messages/TextualBody-test.js |
||
---|---|---|
.. | ||
MKeyVerificationConclusion-test.js | ||
TextualBody-test.js |