Merge branch 'zed2' into zed2-workspace

2023-10-30 12:16:34 +01:00
parent 821fe0f5b5 25e882d72a
commit bd750fbbe2
344 changed files with 23242 additions and 12290 deletions
@@ -188,7 +188,7 @@ fn main() {
        // workspace::init(app_state.clone(), cx);
        // recent_projects::init(cx);

-        // journal::init(app_state.clone(), cx);
+        // journal2::init(app_state.clone(), cx);
        // language_selector::init(cx);
        // theme_selector::init(cx);
        // activity_indicator::init(cx);