Merge remote-tracking branch 'origin/develop' into anoa/public_rooms_module_api github/anoa/public_rooms_module_api anoa/public_rooms_module_api

1 files changed, 1 insertions, 0 deletions

diff --git a/changelog.d/16455.bugfix b/changelog.d/16455.bugfix
new file mode 100644

index 0000000000..653a25d3b6
--- /dev/null
+++ b/changelog.d/16455.bugfix
@@ -0,0 +1 @@
+Prevent the purging of large rooms from timing out when Postgres is in use. The timeout which causes this issue was introduced in Synapse 1.88.0.