Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile

This commit is contained in:
Šimon Brandner 2021-07-08 13:30:57 +02:00
commit 9c67679b35
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
132 changed files with 882 additions and 876 deletions

View file

@ -57,7 +57,6 @@
@import "./views/avatars/_BaseAvatar.scss";
@import "./views/avatars/_DecoratedRoomAvatar.scss";
@import "./views/avatars/_MemberStatusMessageAvatar.scss";
@import "./views/avatars/_PulsedAvatar.scss";
@import "./views/avatars/_WidgetAvatar.scss";
@import "./views/beta/_BetaCard.scss";
@import "./views/context_menus/_CallContextMenu.scss";