diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2021-11-05 22:02:43 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2021-11-05 22:02:43 -0400 |
| commit | 129147d280dbde24a02c561c635ad933e8cb84c8 (patch) | |
| tree | ea6ebc740ac30302c30bc4d5c1046b7c39ced86e /orgmode-backports.org | |
| parent | 10014b8f3395932c44c86cfb9d5abf2650aa9bfd (diff) | |
| download | orgmode-backport-notes-129147d280dbde24a02c561c635ad933e8cb84c8.tar.gz | |
orgmode-backports.org: Update
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 |