Merge branch 'desktop'

1 files changed, 0 insertions, 34 deletions

diff --git a/packages/overlays/matrix-synapse/patches/0026-Fix-typo-in-doc-for-Scheduled-Tasks-Admin-API-18384.patch b/packages/overlays/matrix-synapse/patches/0026-Fix-typo-in-doc-for-Scheduled-Tasks-Admin-API-18384.patch
deleted file mode 100644

index 4635d35..0000000
--- a/packages/overlays/matrix-synapse/patches/0026-Fix-typo-in-doc-for-Scheduled-Tasks-Admin-API-18384.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ea376126a0b7e3fbc0df6ac827eba87d98e479de Mon Sep 17 00:00:00 2001
-From: Shay <hillerys@element.io>
-Date: Fri, 2 May 2025 04:14:31 -0700
-Subject: [PATCH 26/74] Fix typo in doc for Scheduled Tasks Admin API (#18384)
-
----
- changelog.d/18384.doc             | 1 +
- docs/admin_api/scheduled_tasks.md | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 changelog.d/18384.doc
-
-diff --git a/changelog.d/18384.doc b/changelog.d/18384.doc
-new file mode 100644
-index 0000000000..ebcd029639
---- /dev/null
-+++ b/changelog.d/18384.doc
-@@ -0,0 +1 @@
-+Add an Admin API endpoint `GET /_synapse/admin/v1/scheduled_tasks`  to fetch scheduled tasks.
-diff --git a/docs/admin_api/scheduled_tasks.md b/docs/admin_api/scheduled_tasks.md
-index 1708871a6d..b80da5083c 100644
---- a/docs/admin_api/scheduled_tasks.md
-+++ b/docs/admin_api/scheduled_tasks.md
-@@ -19,7 +19,7 @@ It returns a JSON body like the following:
-             "id": "GSA124oegf1",
-             "action": "shutdown_room",
-             "status": "complete",
--            "timestamp": 23423523,
-+            "timestamp_ms": 23423523,
-             "resource_id": "!roomid",
-             "result": "some result",
-             "error": null
--- 
-2.49.0
-