diff options
| -rw-r--r-- | orgmode-backports.org | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index e818d7b..0648f69 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 [25/27] +** master branch [27/29] :PROPERTIES: :ref: origin/master :END: +- [X] fa2e812894b999eba8afc4b146ca5e70fa9bd1c8 + + Merge from origin/emacs-28 + Stefan Kangas + Thu Dec 2 17:34:10 2021 +0100 + +- [X] 50b40e1d4f0063ac78a53673736a2eaa3ba3287b + + ; * lisp/org/ob-julia.el: Fix Author header for authors.el. + Stefan Kangas + Wed Dec 1 17:03:52 2021 +0100 + - [X] f5498a608fe85b66a4068a5ccf88c9b3d3b88f98 Merge from origin/emacs-28 @@ -219,11 +231,17 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [110/110] +** emacs-28 [111/111] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] 50b40e1d4f0063ac78a53673736a2eaa3ba3287b + + ; * lisp/org/ob-julia.el: Fix Author header for authors.el. + Stefan Kangas + Wed Dec 1 17:03:52 2021 +0100 + - [X] 1fffe9a210d328559da2af8facbb75286a31c74e ; * lisp/org/org.el: Fix version header. |