Michael Telatynski ddb0f06005 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

2020-01-27 15:46:38 +00:00

..

_EncryptionInfo.scss

Apply a huge part of the decorations and copy

2020-01-24 16:16:46 +00:00

_UserInfo.scss

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

2020-01-27 15:46:38 +00:00

_VerificationPanel.scss

Apply a huge part of the decorations and copy

2020-01-24 16:16:46 +00:00