sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

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

Browse Source 
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js
This commit is contained in:
Michael Telatynski
2020-01-24 16:19:41 +00:00
parent 7a5e172b88 169ca4a4da
commit 342fcb09c4
36 changed files with 1043 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/css/_components.scss
+1
View File
@@ -150,6 +150,7 @@
@import "./views/rooms/_AuxPanel.scss";
@import "./views/rooms/_BasicMessageComposer.scss";
@import "./views/rooms/_E2EIcon.scss";
@import "./views/rooms/_InviteOnlyIcon.scss";
@import "./views/rooms/_EditMessageComposer.scss";
@import "./views/rooms/_EntityTile.scss";
@import "./views/rooms/_EventTile.scss";