summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-06-29 20:25:47 +0100
committerRichard van der Hoff <richard@matrix.org>2021-06-29 20:25:47 +0100
commit785bceef726789e6969c98be89b073f2e1c10a92 (patch)
tree8536a593648ad86c6e6a3cdc32db7bfdbc456966 /changelog.d
parentDo not recurse into non-spaces in the spaces summary. (#10256) (diff)
parentUpdate newsfiles (diff)
downloadsynapse-785bceef726789e6969c98be89b073f2e1c10a92.tar.xz
Merge branch 'release-v1.37' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/10269.bugfix1
-rw-r--r--changelog.d/10272.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/10269.bugfix b/changelog.d/10269.bugfix
new file mode 100644
index 0000000000..3cefa05788
--- /dev/null
+++ b/changelog.d/10269.bugfix
@@ -0,0 +1 @@
+Handle inbound events from federation asynchronously.
diff --git a/changelog.d/10272.bugfix b/changelog.d/10272.bugfix
new file mode 100644
index 0000000000..3cefa05788
--- /dev/null
+++ b/changelog.d/10272.bugfix
@@ -0,0 +1 @@
+Handle inbound events from federation asynchronously.