Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
This commit is contained in:
commit
9c67679b35
132 changed files with 882 additions and 876 deletions
|
@ -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";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue