Merge branch 'release-v1.42' of github.com:matrix-org/synapse into matrix-org-hotfixes

2 files changed, 2 insertions, 0 deletions

diff --git a/changelog.d/10725.feature b/changelog.d/10725.feature
new file mode 100644

index 0000000000..ffc4e4289c
--- /dev/null
+++ b/changelog.d/10725.feature
@@ -0,0 +1 @@
+Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946).
diff --git a/changelog.d/10734.bugfix b/changelog.d/10734.bugfix
new file mode 100644

index 0000000000..15c7da4497
--- /dev/null
+++ b/changelog.d/10734.bugfix
@@ -0,0 +1 @@
+Remove pushers when deleting a 3pid from an account. Pushers for old unlinked emails will also be deleted.
\ No newline at end of file