summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-01-21 05:31:31 -0500
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2022-01-21 10:40:34 +0000
commit7a11509d17f56b8711a3bda11491b3a5a42a2f67 (patch)
tree75c44a76c4ef2398db67b7181230bc3c9cfa6e06 /changelog.d
parentCorrectly await on_logged_out callbacks (#11786) (diff)
downloadsynapse-7a11509d17f56b8711a3bda11491b3a5a42a2f67.tar.xz
Do not try to serialize raw aggregations dict. (#11791)
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/11612.bugfix1
-rw-r--r--changelog.d/11612.misc1
-rw-r--r--changelog.d/11791.bugfix1
3 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11612.bugfix b/changelog.d/11612.bugfix
new file mode 100644

index 0000000000..842f6892fd --- /dev/null +++ b/changelog.d/11612.bugfix
@@ -0,0 +1 @@ +Include the bundled aggregations in the `/sync` response, per [MSC2675](https://github.com/matrix-org/matrix-doc/pull/2675). diff --git a/changelog.d/11612.misc b/changelog.d/11612.misc deleted file mode 100644
index 2d886169c5..0000000000 --- a/changelog.d/11612.misc +++ /dev/null
@@ -1 +0,0 @@ -Avoid database access in the JSON serialization process. diff --git a/changelog.d/11791.bugfix b/changelog.d/11791.bugfix new file mode 100644
index 0000000000..842f6892fd --- /dev/null +++ b/changelog.d/11791.bugfix
@@ -0,0 +1 @@ +Include the bundled aggregations in the `/sync` response, per [MSC2675](https://github.com/matrix-org/matrix-doc/pull/2675).