diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:04:36 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:04:36 -0700 |
| commit | 656058b790c285aa037a772f752c1446e7423ba2 (patch) | |
| tree | 770fbf699587d51ed3a374c6f01bdd655394c66c /lisp/emacs-lisp/autoload.el | |
| parent | f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd (diff) | |
| parent | 8a35f83c6c2ce602ee4d1e54c64067c851a2a43f (diff) | |
| download | emacs-656058b790c285aa037a772f752c1446e7423ba2.tar.gz emacs-656058b790c285aa037a772f752c1446e7423ba2.tar.bz2 emacs-656058b790c285aa037a772f752c1446e7423ba2.zip | |
; 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
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
0 files changed, 0 insertions, 0 deletions