]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Fri, 13 Nov 2020 17:00:26 +0000 (09:00 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 13 Nov 2020 17:00:26 +0000 (09:00 -0800)
a3d316bbb7 (origin/emacs-27) Update information about refcards
f43e9ad524 Avoid crashes in the daemon due to user interaction

1  2 
admin/release-process
src/minibuf.c

Simple merge
diff --cc src/minibuf.c
Simple merge