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

This commit is contained in:
Michael Telatynski 2021-08-04 12:14:29 +01:00
commit 2d3211ccf6
49 changed files with 1609 additions and 434 deletions

View file

@ -267,6 +267,7 @@
@import "./views/spaces/_SpacePublicShare.scss";
@import "./views/terms/_InlineTermsAgreement.scss";
@import "./views/toasts/_AnalyticsToast.scss";
@import "./views/toasts/_IncomingCallToast.scss";
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
@import "./views/verification/_VerificationShowSas.scss";
@import "./views/voip/_CallContainer.scss";