update changelog

6 years ago · e26e6b3230
parent f3ff64e000
commit e26e6b3230
3 changed files with 1 additions and 3 deletions
--- 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))
--- a/changelog.d/5203.feature
+++ b/changelog.d/5203.feature
@ -1 +0,0 @@
 Add experimental support for relations (aka reactions and edits).
--- a/changelog.d/5212.feature
+++ b/changelog.d/5212.feature
@ -1 +0,0 @@
 Add experimental support for relations (aka reactions and edits).
		`@ -1 +0,0 @@`
			`Add experimental support for relations (aka reactions and edits).`