summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-06-03 11:23:27 +0100
committerRichard van der Hoff <richard@matrix.org>2020-06-03 11:23:27 +0100
commit3820c24836f1ce70f5a3401db7f4f2d07aa36876 (patch)
tree55e91e6f842fff20dfebd4eb83846b78c77eef7c /CHANGES.md
parentClean up exception handling in SAML2ResponseResource (#7614) (diff)
parentFix typo in PR link (diff)
downloadsynapse-3820c24836f1ce70f5a3401db7f4f2d07aa36876.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index bc1d1beb00..dbb21d4c76 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -53,7 +53,7 @@ Bugfixes
 - Fix bug where a local user leaving a room could fail under rare circumstances. ([\#7548](https://github.com/matrix-org/synapse/issues/7548))
 - Fix "Missing RelayState parameter" error when using user interactive authentication with SAML for some SAML providers. ([\#7552](https://github.com/matrix-org/synapse/issues/7552))
 - Fix exception `'GenericWorkerReplicationHandler' object has no attribute 'send_federation_ack'`, introduced in v1.13.0. ([\#7564](https://github.com/matrix-org/synapse/issues/7564))
-- `synctl` now warns if it was unable to stop Synapse and will not attempt to start Synapse if nothing was stopped. Contributed by Romain Bouyé. ([\#6590](https://github.com/matrix-org/synapse/issues/6590))
+- `synctl` now warns if it was unable to stop Synapse and will not attempt to start Synapse if nothing was stopped. Contributed by Romain Bouyé. ([\#6598](https://github.com/matrix-org/synapse/issues/6598))
 
 
 Updates to the Docker image