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

..

structures

Be consistent about our settings svg, free the other one

2020-01-22 15:34:17 +00:00

views

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

_common.scss

Add icon to bootstrap dialogs

2020-01-22 11:44:47 +00:00

_components.scss

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

rethemendex.sh

…