diff options
| -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 d1d0447..6cdd06e 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 [39/46] +** master branch [41/48] :PROPERTIES: :ref: origin/master :END: +- [X] ad125a99273c7bd81d02d388af3c69125dfe27ee + + Merge from origin/emacs-28 + Stefan Kangas + Sun Jan 2 06:31:44 2022 +0100 + +- [X] f475c5823a409356721e49577116521467680ff4 + + ; Copyright year fixes + Glenn Morris + Sat Jan 1 10:02:17 2022 -0800 + - [X] dcd76bd48df678d8234b904d7b13c997228519a3 Merge from origin/emacs-28 |