summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-06-06 10:59:20 +0100
committerErik Johnston <erik@matrix.org>2023-06-06 10:59:20 +0100
commit1a5495347350d439d958c22dd815d89a777ec89d (patch)
tree877b44f14153f69d1f7dd63896d43b4167ded171
parentMerge branch 'master' into develop (diff)
parentFix link in changelog (diff)
downloadsynapse-1a5495347350d439d958c22dd815d89a777ec89d.tar.xz
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--CHANGES.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index ea13b554ba..905713b2af 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ No significant changes since 1.85.0rc2.
 
 The following issues are fixed in 1.85.0 (and RCs).
 
-- [GHSA-26c5-ppr8-f33p](https://github.com/matrix-org/synapse/security/advisories/GHSA-26c5-ppr8-f33p) / [CVE-2023-32682](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-32683) — Low Severity
+- [GHSA-26c5-ppr8-f33p](https://github.com/matrix-org/synapse/security/advisories/GHSA-26c5-ppr8-f33p) / [CVE-2023-32682](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-32682) — Low Severity
 
   It may be possible for a deactivated user to login when using uncommon configurations.