]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f95bbe5 8a35f83)
; 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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.