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

This commit is contained in:
Michael Telatynski 2021-03-25 16:37:56 +00:00
commit 5061db259a
46 changed files with 3417 additions and 665 deletions

View file

@ -212,6 +212,7 @@
@import "./views/rooms/_SendMessageComposer.scss";
@import "./views/rooms/_Stickers.scss";
@import "./views/rooms/_TopUnreadMessagesBar.scss";
@import "./views/rooms/_VoiceRecordComposerTile.scss";
@import "./views/rooms/_WhoIsTypingTile.scss";
@import "./views/settings/_AvatarSetting.scss";
@import "./views/settings/_CrossSigningPanel.scss";