diff options
author | Richard van der Hoff <richard@matrix.org> | 2021-01-28 22:08:11 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2021-01-28 22:08:11 +0000 |
commit | 0d81a6fa3e1dc832f56ed09805229b9089758ba5 (patch) | |
tree | 08a29e6210ef63c506f8a50944163cdabd400a8b /changelog.d | |
parent | Ratelimit 3PID /requestToken API (#9238) (diff) | |
parent | Add 'brand' field to MSC2858 response (#9242) (diff) | |
download | synapse-0d81a6fa3e1dc832f56ed09805229b9089758ba5.tar.xz |
Merge branch 'social_login' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/9183.feature | 2 | ||||
-rw-r--r-- | changelog.d/9242.feature | 1 | ||||
-rw-r--r-- | changelog.d/9245.feature | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/9183.feature b/changelog.d/9183.feature index 2d5c735042..3bcd9f15d1 100644 --- a/changelog.d/9183.feature +++ b/changelog.d/9183.feature @@ -1 +1 @@ -Add experimental support for allowing clients to pick an SSO Identity Provider ([MSC2858](https://github.com/matrix-org/matrix-doc/pull/2858). +Add experimental support for allowing clients to pick an SSO Identity Provider ([MSC2858](https://github.com/matrix-org/matrix-doc/pull/2858)). diff --git a/changelog.d/9242.feature b/changelog.d/9242.feature new file mode 100644 index 0000000000..3bcd9f15d1 --- /dev/null +++ b/changelog.d/9242.feature @@ -0,0 +1 @@ +Add experimental support for allowing clients to pick an SSO Identity Provider ([MSC2858](https://github.com/matrix-org/matrix-doc/pull/2858)). diff --git a/changelog.d/9245.feature b/changelog.d/9245.feature new file mode 100644 index 0000000000..b9238207e2 --- /dev/null +++ b/changelog.d/9245.feature @@ -0,0 +1 @@ +Add support to the OpenID Connect integration for adding the user's email address. |