diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2023-05-08 20:11:23 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2023-05-08 20:11:23 -0400 |
| commit | 5549dd6c6d4f0d9a3cafd3e3a413482994dbed0d (patch) | |
| tree | 6c3400670fa847fef9f26486f1d48562ceac6d93 /orgmode-backports.org | |
| parent | 3b3b9cd0c0b944b41fe0da00cba9f711084ed3e1 (diff) | |
| download | orgmode-backport-notes-5549dd6c6d4f0d9a3cafd3e3a413482994dbed0d.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 0bb1385..2973b8c 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 [25/26] +** master branch [26/27] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] daf602a5c8ec9e5d94f5e1e412182760a02c2505 + + Merge from origin/emacs-29 + Eli Zaretskii + Tue May 2 08:50:09 2023 -0400 + - [X] 095ec506d03b76155b399fd7b23554279b2cfee0 Merge from origin/emacs-29 |