Merge branch 'main' into collab_ui-zed2

2023-11-23 15:02:55 +01:00
parent c191943849 72a1ada0ae
commit 390ecb5b0c
51 changed files with 339 additions and 323 deletions
@@ -31,7 +31,7 @@ use std::sync::Arc;
 use call::ActiveCall;
 use client::{Client, UserStore};
 use gpui::{
-    div, px, rems, AppContext, Div, InteractiveElement, Model, ParentElement, Render, RenderOnce,
+    div, px, rems, AppContext, Div, InteractiveElement, IntoElement, Model, ParentElement, Render,
    Stateful, StatefulInteractiveElement, Styled, Subscription, ViewContext, VisualContext,
    WeakView, WindowBounds,
 };