summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-12-18 09:51:51 +0000
committerRichard van der Hoff <richard@matrix.org>2019-12-18 09:51:51 +0000
commit6e8f8e14f272a5de61de675f6a01a5e1fc834c41 (patch)
tree5cc934c1e024e101cde67f698ee5b957101942b3 /changelog.d
parentRemove unused `get_pagination_rows` methods. (#6557) (diff)
parentFix bug where we added duplicate event IDs as auth_events (#6560) (diff)
downloadsynapse-6e8f8e14f272a5de61de675f6a01a5e1fc834c41.tar.xz
Merge release-v1.7.1 into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6553.bugfix1
-rw-r--r--changelog.d/6560.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/6553.bugfix b/changelog.d/6553.bugfix
new file mode 100644
index 0000000000..4fe576b873
--- /dev/null
+++ b/changelog.d/6553.bugfix
@@ -0,0 +1 @@
+Fix a bug causing responses to the `/context` client endpoint to not use the pruned version of the event.
diff --git a/changelog.d/6560.bugfix b/changelog.d/6560.bugfix
new file mode 100644
index 0000000000..e75639f5b4
--- /dev/null
+++ b/changelog.d/6560.bugfix
@@ -0,0 +1 @@
+Fix a cause of state resets in room versions 2 onwards.