aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org14
1 files changed, 13 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 0615042..6779415 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 [8/9]
+** master branch [10/11]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] 8aceb37b47a8f97fc42caaaf021ac06dc9f67827
+
+ Merge from origin/emacs-28
+ Glenn Morris
+ Mon Oct 11 08:04:57 2021 -0700
+
+- [X] bcce93f04c2df6a5bb5dd1a8e611de734d24aee7
+
+ Update to Org 9.5-46-gb71474
+ Kyle Meyer
+ Sat Oct 9 16:34:12 2021 -0400
+
- [ ] 66409422214a0a90e1d2a12ef2c4ebf86f2c01a9
Use format-prompt for many more prompts