aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2024-06-28 19:51:25 -0400
committerKyle Meyer <kyle@kyleam.com>2024-06-28 19:51:25 -0400
commitce83dede89ac0e94410bb79a8cbfc337e95f5daf (patch)
treed66f225f9ef4e621e0fabb4e1c0fe016426b83ee /orgmode-backports.org
parent83daf08368675e73282b40531486e6ba271bb83e (diff)
downloadorgmode-backport-notes-ce83dede89ac0e94410bb79a8cbfc337e95f5daf.tar.gz
orgmode-backports.org: Update
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 cfc3da2..6b75ea2 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 [84/84]
+** master branch [85/85]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-30
:END:
+- [X] 48f9dde1331e1c4af1856efd41886e655d670d19
+
+ Merge from savannah/emacs-30
+ Po Lu
+ Fri Jun 28 14:46:58 2024 +0800
+
- [X] cb3d92da82d11967d728ddb1a0b5c2e8ca618e90
Merge from savannah/emacs-30