diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2023-12-10 10:41:16 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2023-12-10 11:45:12 -0500 |
| commit | c4b9c6b63ce1665c508ac3b8179369ed9c43427e (patch) | |
| tree | b175eb620a47b012f9c21fa528cb1ec2ab8c032b /orgmode-backports.org | |
| parent | 15bb4094ad6c5607464404e1735722afce495178 (diff) | |
| download | orgmode-backport-notes-c4b9c6b63ce1665c508ac3b8179369ed9c43427e.tar.gz | |
orgmode-backports.org: Update
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index b6625a0..4f63567 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 [36/56] +** master branch [36/57] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [ ] 486094126ba77e45c50acb87f5ad3e4147608446 + + Merge from origin/emacs-29 + Eli Zaretskii + Sat Dec 9 07:25:21 2023 -0500 + - [X] c9d7740574758d47c8864cbada5fd2a2b2ee8911 Merge from origin/emacs-29 |