]> git.eshelyaron.com Git - emacs.git/commit
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 18:04:36 +0000 (11:04 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 18:04:36 +0000 (11:04 -0700)
commit656058b790c285aa037a772f752c1446e7423ba2
tree770fbf699587d51ed3a374c6f01bdd655394c66c
parentf95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd
parent8a35f83c6c2ce602ee4d1e54c64067c851a2a43f
; Merge from origin/emacs-25

The following commits were skipped:

8a35f83 Render empty <ul><li><ul> correctly
d8b2ce5 Ignore invalid base64 encoded embedded images
52ba24b Fix <p> and <div> newlines with or without <li> in shr