Merge remote-tracking branch 'upstream/main' into conduwuit-changes

This commit is contained in:
strawberry
2024-08-14 01:47:43 -04:00
63 changed files with 2708 additions and 523 deletions

View File

@@ -32,7 +32,7 @@ criterion = { workspace = true, optional = true }
[dev-dependencies]
maplit = { workspace = true }
rand = "0.8.3"
rand = { workspace = true }
ruma-events = { workspace = true, features = ["unstable-pdu"] }
tracing-subscriber = "0.3.16"