summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-21 17:37:19 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-21 17:37:19 +0100
commite26e6b3230f0b55376f0f3bf823dd789ac7064d0 (patch)
treee9b42377e921d8f31d317f4ff65926964adf6046
parentMerge commit 'f4c80d70f' into release-v0.99.5 (diff)
downloadsynapse-e26e6b3230f0b55376f0f3bf823dd789ac7064d0.tar.xz
update changelog v0.99.5rc1
-rw-r--r--CHANGES.md2
-rw-r--r--changelog.d/5203.feature1
-rw-r--r--changelog.d/5212.feature1
3 files changed, 1 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 7eab35be30..25ceec8b48 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,7 +9,7 @@ Features
 - Drop support for the undocumented /_matrix/client/v2_alpha API prefix. ([\#5190](https://github.com/matrix-org/synapse/issues/5190))
 - Add an option to disable per-room profiles. ([\#5196](https://github.com/matrix-org/synapse/issues/5196))
 - Stick an expiration date to any registered user missing one at startup if account validity is enabled. ([\#5204](https://github.com/matrix-org/synapse/issues/5204))
-- Add experimental support for relations (aka reactions and edits). ([\#5209](https://github.com/matrix-org/synapse/issues/5209), [\#5211](https://github.com/matrix-org/synapse/issues/5211))
+- Add experimental support for relations (aka reactions and edits). ([\#5209](https://github.com/matrix-org/synapse/issues/5209), [\#5211](https://github.com/matrix-org/synapse/issues/5211), [\#5203](https://github.com/matrix-org/synapse/issues/5203), [\#5212](https://github.com/matrix-org/synapse/issues/5212))
 - Add a room version 4 which uses a new event ID format, as per [MSC2002](https://github.com/matrix-org/matrix-doc/pull/2002). ([\#5210](https://github.com/matrix-org/synapse/issues/5210), [\#5217](https://github.com/matrix-org/synapse/issues/5217))
 
 
diff --git a/changelog.d/5203.feature b/changelog.d/5203.feature
deleted file mode 100644
index 747098c166..0000000000
--- a/changelog.d/5203.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add experimental support for relations (aka reactions and edits).
diff --git a/changelog.d/5212.feature b/changelog.d/5212.feature
deleted file mode 100644
index 747098c166..0000000000
--- a/changelog.d/5212.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add experimental support for relations (aka reactions and edits).