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

Merge branch 'main' into notifications

Browse source
This commit is contained in:
Max Brunsfeld 2023-10-22 12:25:30 +02:00
commit 234ccbe51f
73 changed files with 2196 additions and 961 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/collab_ui/src/collab_ui.rs
View file

@ -6,7 +6,6 @@ mod face_pile;
pub mod notification_panel;
pub mod notifications;
mod panel_settings;
mod sharing_status_indicator;
use call::{report_call_event_for_room, ActiveCall, Room};
use feature_flags::{ChannelsAlpha, FeatureFlagAppExt};
@ -46,7 +45,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
collab_panel::init(cx);
chat_panel::init(cx);
notifications::init(&app_state, cx);
sharing_status_indicator::init(cx);
cx.add_global_action(toggle_screen_sharing);
cx.add_global_action(toggle_mute);