Merge branch 'main' into window_context_2

2023-04-21 10:58:08 +02:00
parent d32a7218cd 8e4cc549dc
commit c76b9794e4
45 changed files with 1760 additions and 882 deletions
@@ -1192,7 +1192,7 @@ dependencies = [

 [[package]]
 name = "collab"
-version = "0.8.3"
+version = "0.9.0"
 dependencies = [
 "anyhow",
 "async-tungstenite",
@@ -1834,6 +1834,7 @@ dependencies = [
 "editor",
 "gpui",
 "language",
+ "lsp",
 "postage",
 "project",
 "serde_json",
@@ -8522,7 +8523,7 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"

 [[package]]
 name = "zed"
-version = "0.83.0"
+version = "0.84.0"
 dependencies = [
 "activity_indicator",
 "anyhow",