aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorEli Zaretskii2024-03-30 04:35:24 -0400
committerEli Zaretskii2024-03-30 04:35:24 -0400
commitcd60fa42f6803d4d34dedfaea3d1ed5c16349670 (patch)
treecc659049831aba7a89e399dcf0805af607fb8978 /admin
parent06882a2d768241a814d7f9da24e1e5436207c0d8 (diff)
parent7a5d7be52c5f0690ee47f30bfad973827261abf2 (diff)
downloademacs-cd60fa42f6803d4d34dedfaea3d1ed5c16349670.tar.gz
emacs-cd60fa42f6803d4d34dedfaea3d1ed5c16349670.zip
Merge from origin/emacs-29
7a5d7be52c5 org--confirm-resource-safe: Fix prompt when prompting in ... 2bc865ace05 org-file-contents: Consider all remote files unsafe 6f9ea396f49 org-latex-preview: Add protection when `untrusted-content... 937b9042ad7 * lisp/gnus/mm-view.el (mm-display-inline-fontify): Mark ... ccc188fcf98 * lisp/files.el (untrusted-content): New variable. befa9fcaae2 org-macro--set-templates: Prevent code evaluation 3221d8d4611 * admin/authors.el (authors-aliases): Add ignored authors. 8d8253f8991 * etc/NEWS: Update for Emacs 29.3
Diffstat (limited to 'admin')
-rw-r--r--admin/authors.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/admin/authors.el b/admin/authors.el
index 8ea6064423f..da9f4257153 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -176,8 +176,10 @@ files.")
176 ("Miha Rihtaršič" "Miha Rihtarsic") 176 ("Miha Rihtaršič" "Miha Rihtarsic")
177 ("Mikio Nakajima" "Nakajima Mikio") 177 ("Mikio Nakajima" "Nakajima Mikio")
178 (nil "montag451@laposte\\.net") 178 (nil "montag451@laposte\\.net")
179 (nil "na@aisrntairetnraoitn")
180 ("Morgan Smith" "Morgan J\\. Smith") 179 ("Morgan Smith" "Morgan J\\. Smith")
180 ("Mou Tong" "mou\\.tong@outlook\\.com")
181 (nil "na@aisrntairetnraoitn")
182 (nil "nibon7@163\\.com")
181 ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") 183 ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
182 ("Noah Peart" "noah\\.v\\.peart@gmail\\.com") 184 ("Noah Peart" "noah\\.v\\.peart@gmail\\.com")
183 ("Noorul Islam" "Noorul Islam K M") 185 ("Noorul Islam" "Noorul Islam K M")