Merge branch 'main' into screen-sharing

# Conflicts: # crates/collab/src/integration_tests.rs # crates/collab/src/main.rs # styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00 · 2022-10-21 14:29:45 +02:00 · 7e411ae098
commit 7e411ae098
parent 1bbb7dd126 77b13b1356
75 changed files with 2438 additions and 1903 deletions
--- a/crates/collab/src/integration_tests.rs
+++ b/crates/collab/src/integration_tests.rs
@ -6478,8 +6478,7 @@ impl TestServer {
        Arc::new(AppState {
            db: test_db.db().clone(),
            live_kit_client: Some(Arc::new(fake_server.create_api_client())),
-            api_token: Default::default(),
-            invite_link_prefix: Default::default(),
+            config: Default::default(),
        })
    }