Merge ef9f6ae22a into 74a0d5f289

Spec for MSC4312: Resetting cross-signing keys in the OAuth world
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
2026-05-02 07:04:09 +02:00 · 2025-10-26 10:10:15 +01:00 · 2025-10-17 14:45:54 +02:00
2 changed files with 0 additions and 2 deletions
--- a/changelogs/client_server/newsfragments/2233.clarification
+++ b/changelogs/client_server/newsfragments/2233.clarification
@ -1 +0,0 @@
-Add `m.login.terms` to enumeration of authentication types.
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@ -906,7 +906,6 @@ This specification defines the following auth types:
 -   `m.login.msisdn`
 -   `m.login.dummy`
 -   `m.login.registration_token`
-   {{% added-in v="1.11" %}} `m.login.terms`
 -   {{% added-in v="1.17" %}} `m.oauth`

 ###### Password-based
Author	SHA1	Message	Date
Johannes Marbach	9346f4f123	Merge `ef9f6ae22a` into `74a0d5f289`	2025-10-26 10:10:15 +01:00
Johannes Marbach	ef9f6ae22a	Spec for MSC4312: Resetting cross-signing keys in the OAuth world Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-17 14:45:54 +02:00
				`@ -1 +0,0 @@`
				Add `m.login.terms` to enumeration of authentication types.