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

crates/ruma-state-res/CHANGELOG.md

@@ -1,11 +1,17 @@
 # [unreleased]
 
+# 0.11.0
+
+Breaking changes:
+
+- Upgrade dependencies
+
 Bug fixes:
 
-* Disallow `invite` -> `knock` membership transition
-  * The spec was determined to be right about rejecting it in the first place:
-    <https://github.com/matrix-org/matrix-spec/pull/1717>
-* Perform extra redaction checks on room versions 1 and 2, rather than for
+- Disallow `invite` -> `knock` membership transition.
+  The spec was determined to be right about rejecting it in the first place:
+  <https://github.com/matrix-org/matrix-spec/pull/1717>
+- Perform extra redaction checks on room versions 1 and 2, rather than for
   version 3 and onwards
 
 # 0.10.0

crates/ruma-state-res/Cargo.toml

@@ -7,7 +7,7 @@ homepage = "https://ruma.dev/"
 repository = "https://github.com/ruma/ruma"
 readme = "README.md"
 license = "MIT"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2021"
 rust-version = { workspace = true }