Merge 54f32b72de into 252de984cc

2026-05-03 07:34:10 +02:00 · 2026-03-10 17:44:02 -05:00
6 changed files with 2 additions and 5 deletions
--- a/changelogs/client_server/newsfragments/2328.feature
+++ b/changelogs/client_server/newsfragments/2328.feature
@ -1 +1 @@
-Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).
+Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/423O).
--- a/changelogs/client_server/newsfragments/2329.clarification
+++ b/changelogs/client_server/newsfragments/2329.clarification
--- a/changelogs/client_server/newsfragments/2337.clarification
+++ b/changelogs/client_server/newsfragments/2337.clarification
@ -1 +0,0 @@
 Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2338.feature
+++ b/changelogs/client_server/newsfragments/2338.feature
@ -1 +0,0 @@
 Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).
--- a/changelogs/server_server/newsfragments/2338.clarification
+++ b/changelogs/server_server/newsfragments/2338.clarification
@ -1 +0,0 @@
 Fix various typos throughout the specification.
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@ -637,7 +637,7 @@ request.
 The prompt for Bob to accept/reject Alice's request (or the unsupported method
 prompt) should be automatically dismissed 10 minutes after the `timestamp` (in
-the case of to-device messages) or `origin_server_ts` (in the case of in-room
+the case of to-device messages) or `origin_ts` (in the case of in-room
 messages) field or 2 minutes after Bob's client receives the message, whichever
 comes first, if Bob does not interact with the prompt. The prompt should
 additionally be hidden if an appropriate `m.key.verification.cancel` message is
`@ -1 +1 @@`
	Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).	Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/423O).
		`@ -1 +0,0 @@`
			`Fix various typos throughout the specification.`