Combine changelogs

richvdh · richvdh · commit 295c9dbf41f7 · 2024-04-04T16:52:24.000+01:00
diff --git a/changelog.d/16930.bugfix b/changelog.d/16930.bugfix
@@ -1 +1 @@
-Fix a long-standing bug which could cause state to be omitted from `/sync` responses when certain events are filtered out of the timeline.
+Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
diff --git a/changelog.d/16932.bugfix b/changelog.d/16932.bugfix
@@ -1 +1 @@
-Fix a long-standing bug which could cause incorrect state to be returned from `/sync` for rooms where the user has left.
+Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-Fix a long-standing bug which could cause state to be omitted from `/sync` responses when certain events are filtered out of the timeline.
	`1`	+Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.