Merge branch 'zed2' of github.com:zed-industries/zed into zed2

2023-10-25 20:38:03 +02:00
parent e67048ee7b 5ba04dce2b
commit b5eae86b67
16 changed files with 1931 additions and 120 deletions
@@ -13,7 +13,7 @@ test-support = ["collections/test-support", "gpui2/test-support", "rpc/test-supp

 [dependencies]
 collections = { path = "../collections" }
-db = { path = "../db" }
+db2 = { path = "../db2" }
 gpui2 = { path = "../gpui2" }
 util = { path = "../util" }
 rpc = { path = "../rpc" }