Files
element-web/src/components/views/messages
Michael Telatynski 342fcb09c4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js
2020-01-24 16:19:41 +00:00
..
2019-12-22 21:15:54 -07:00
2019-12-22 21:15:54 -07:00
2019-05-17 17:44:11 +01:00