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
This commit is contained in:
Glenn Morris 2020-08-03 08:31:15 -07:00
commit 78d1092bcc
2 changed files with 1 additions and 2 deletions

View file

@ -58779,7 +58779,7 @@
* lisp/net/soap-client.el (soap-type-of): Optimize for Emacs≥26
2018-07-17 Alex <agrambot@gmail.com>
2018-07-17 Alexander Gramiak <agrambot@gmail.com>
Remove menu name from emacs-lisp-mode-map (Bug#27114)

View file

@ -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.