Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into collab_ui-zed2

Browse source
This commit is contained in:
Piotr Osiewicz 2023-11-23 15:02:55 +01:00
commit 390ecb5b0c
51 changed files with 339 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab_ui2/src/collab_titlebar_item.rs
View file

@ -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,
};