]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 7 Jan 2019 19:51:38 +0000 (11:51 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 7 Jan 2019 19:51:38 +0000 (11:51 -0800)
commit1a07b12aaaefce9959297c72b73ef111bf2e866e
tree3c6234368ba24a781a232903cda378a98af6c29c
parentff406671b10ad46d4b2b2abcabe0fdf64293c61c
parentf1ce72b7c6cd53265c1a3fa11d1111e44c16bf52
Merge from origin/emacs-26

f1ce72b ; ChangeLog.3 update
5b59cf0 * etc/AUTHORS: Update.
2cf20b6 * lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug...

# Conflicts:
# ChangeLog.3
# lisp/textmodes/mhtml-mode.el
ChangeLog.3
lisp/textmodes/mhtml-mode.el