Files
element-web/src
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
..
2020-01-16 01:45:16 +00:00
2019-12-22 21:15:54 -07:00
2019-12-22 20:57:46 -07:00
2020-01-17 17:02:31 +01:00
2019-12-22 21:15:54 -07:00
2020-01-24 13:15:57 +00:00
2020-01-13 13:28:33 -07:00
2020-01-08 10:52:03 +00:00
2020-01-17 13:50:24 +00:00
2019-11-06 10:41:14 +01:00
2020-01-24 12:28:03 +00:00
2019-12-22 21:15:54 -07:00
2020-01-13 13:28:33 -07:00
2019-12-22 21:15:54 -07:00
2019-12-22 21:15:54 -07:00
2019-12-22 21:15:54 -07:00
2019-12-22 21:15:54 -07:00
2019-12-22 21:15:54 -07:00