aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org8
1 files changed, 7 insertions, 1 deletions
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