Merge branch 'main' into links
This commit is contained in:
commit
d4ef764305
66 changed files with 1668 additions and 657 deletions
|
@ -655,7 +655,7 @@ impl CollabPanel {
|
|||
channel_editing_state: None,
|
||||
selection: None,
|
||||
user_store: workspace.user_store().clone(),
|
||||
channel_store: workspace.app_state().channel_store.clone(),
|
||||
channel_store: ChannelStore::global(cx),
|
||||
project: workspace.project().clone(),
|
||||
subscriptions: Vec::default(),
|
||||
match_candidates: Vec::default(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue