chore: resolve conflicts with main

This commit is contained in:
Lake committed 2026-09-12 15:07:35 -05:00
commit 439f266d8f
14 files changed
+563 -376

No files matched your search

-2
View File
@@ -80,7 +80,6 @@ futures.workspace = true
http-body-util.workspace = true
http.workspace = true
ipaddress.workspace = true
itertools.workspace = true
libc.workspace = true
libloading.workspace = true
libloading.optional = true
@@ -91,7 +90,6 @@ rand.workspace = true
regex.workspace = true
reqwest.workspace = true
sha2.workspace = true
assign.workspace = true
ruma.workspace = true
sanitize-filename.workspace = true
serde_json.workspace = true