Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0

5 files changed, 5 insertions, 0 deletions

diff --git a/changelog.d/8940.misc b/changelog.d/8940.misc
new file mode 100644

index 0000000000..4ff0b94b94
--- /dev/null
+++ b/changelog.d/8940.misc
@@ -0,0 +1 @@
+Add type hints to push module.
diff --git a/changelog.d/8945.bugfix b/changelog.d/8945.bugfix
new file mode 100644

index 0000000000..f9e6dbba56
--- /dev/null
+++ b/changelog.d/8945.bugfix
@@ -0,0 +1 @@
+Fix a bug where 500 errors would be returned if the `m.room_history_visibility` event had invalid content.
diff --git a/changelog.d/8946.misc b/changelog.d/8946.misc
new file mode 100644

index 0000000000..54502e9b90
--- /dev/null
+++ b/changelog.d/8946.misc
@@ -0,0 +1 @@
+Refactor test utilities for injecting HTTP requests.
diff --git a/changelog.d/8951.feature b/changelog.d/8951.feature
new file mode 100644

index 0000000000..d450ef4998
--- /dev/null
+++ b/changelog.d/8951.feature
@@ -0,0 +1 @@
+Add support for allowing users to pick their own user ID during a single-sign-on login.
diff --git a/changelog.d/8952.misc b/changelog.d/8952.misc
new file mode 100644

index 0000000000..4c4a874649
--- /dev/null
+++ b/changelog.d/8952.misc
@@ -0,0 +1 @@
+Fix bug in `generate_log_config` script which made it write empty files.