summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2022-01-05 12:09:15 -0500
committerPatrick Cloke <patrickc@matrix.org>2022-01-05 12:09:15 -0500
commit83acdb23fe318f8a41d2a6b800d994d46754a903 (patch)
tree3330f98ae99a1f043a0e060858e57c384907f640
parentInclude `io.element.thread` capability for MSC3440. (#11690) (diff)
downloadsynapse-83acdb23fe318f8a41d2a6b800d994d46754a903.tar.xz
Re-run towncrier.
-rw-r--r--CHANGES.md1
-rw-r--r--changelog.d/11690.misc1
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index e8cd60e9e5..486cfae86f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -83,6 +83,7 @@ Internal Changes
 - Improve the error messages from  `get_create_event_for_room`. ([\#11638](https://github.com/matrix-org/synapse/issues/11638))
 - Remove redundant `get_current_events_token` method. ([\#11643](https://github.com/matrix-org/synapse/issues/11643))
 - Convert `namedtuples` to `attrs`. ([\#11665](https://github.com/matrix-org/synapse/issues/11665), [\#11574](https://github.com/matrix-org/synapse/issues/11574))
+- Update the `/capabilities` response to include whether support for [MSC3440](https://github.com/matrix-org/matrix-doc/pull/3440) is available. ([\#11690](https://github.com/matrix-org/synapse/issues/11690))
 
 
 Synapse 1.49.2 (2021-12-21)
diff --git a/changelog.d/11690.misc b/changelog.d/11690.misc
deleted file mode 100644
index 76cd286862..0000000000
--- a/changelog.d/11690.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update the `/capabilities` response to include whether support for [MSC3440](https://github.com/matrix-org/matrix-doc/pull/3440) is available.