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

..

NewSessionToast.js

Toasts for new, unverified sessions

2020-01-17 11:43:35 +00:00

VerificationRequestToast.js

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration

2020-01-24 16:19:41 +00:00