From b9d57502da8ae4e11523a155e0fd608433e1025d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 13 Sep 2019 16:06:03 +0100
Subject: [PATCH] changelog

---
 changelog.d/6037.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6037.feature

diff --git a/changelog.d/6037.feature b/changelog.d/6037.feature
new file mode 100644
index 0000000000..95d82bd4d8
--- /dev/null
+++ b/changelog.d/6037.feature
@@ -0,0 +1 @@
+Handle userid clashes when authenticating via SAML by appending an integer suffix.
\ No newline at end of file