From b24c5110c6f1c332b410e793c5f060c614df3b31 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 31 Aug 2024 14:54:01 -0400 Subject: orgmode-backports.org: Update --- orgmode-backports.org | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/orgmode-backports.org b/orgmode-backports.org index 54d5f09..80ba5bd 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,18 @@ After resolving the conflict, run NOTE: Look for "ONSYNC" for changes that should be considered when syncing, but that don't seem appropriate for Org backport. -** master branch [92/93] +** master branch [93/94] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-30 :END: +- [X] a2684967270387d2e7ec79de148f04b7f54f2260 + + Merge from savannah/emacs-30 + Po Lu + Tue Aug 20 21:57:25 2024 +0800 + - [X] c3c27a919c2b4552da672391606ab336a5783d35 Merge from origin/emacs-30 -- cgit v1.2.3