diff options
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index afc351c..89cc45a 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,11 +54,23 @@ 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 [14/15] +** master branch [16/17] :PROPERTIES: :ref: origin/master :END: +- [X] 0abf01402b4c1959b363ae1c7085fd356fb102a4 + + Merge from origin/emacs-28 + Eli Zaretskii + Sun Oct 31 18:46:29 2021 +0200 + +- [X] f1c9286376d570e898d349200412021fd67e13d2 + + ; * doc/misc/org.org: fix capture context example + Hanno Perrey + Sun Oct 31 16:23:41 2021 +0100 + - [X] b931e11a03fdb44e378133b10f312e38b1b3d712 Merge from origin/emacs-28 |