diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-08-03 08:31:15 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-08-03 08:31:15 -0700 |
| commit | 78d1092bcc2d2e77602657bb5ae85ff5ac9f1faf (patch) | |
| tree | 6b6fb1f0983386972007ad06fa3fdd00d189d6a0 /admin | |
| parent | 99275822c6c36ac308a7b77b5271066df5f38dfb (diff) | |
| parent | e12d1fbc1568cc90b3b99bb6b9f244e5d10e97a4 (diff) | |
| download | emacs-78d1092bcc2d2e77602657bb5ae85ff5ac9f1faf.tar.gz | |
Merge from origin/emacs-27
e12d1fbc15 ; ChangeLog.3 and etc/AUTHORS fixes
748f0d4bc6 * admin/authors.el (authors-aliases): Remove a faulty regexp.
# Conflicts:
# etc/AUTHORS
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/admin/authors.el b/admin/authors.el index 1c069173c85..cf9cf9871e5 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -212,7 +212,6 @@ files.") ("Carlos Pita" "memeplex") ("Vinicius Jose Latorre" "viniciusjl") ("Gaby Launay" "galaunay") - ("Alex Gramiak" "alex") ("Dick R. Chiang" "dickmao") ) "Alist of author aliases. |