Merge branch 'maint'
commitb0ab7008df2b9c8fe0cdffc93644983bc26b477b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 26 Nov 2017 09:47:55 +0000 (26 10:47 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 26 Nov 2017 09:47:55 +0000 (26 10:47 +0100)
tree83fc7f327f033123e73265d25a31cb9c4e748481
parentbe1e8079421bcd452ea4b2d0c9c1e68483741dad
parent6aac798f2556041113d72d79ddc68d7d27017e38
Merge branch 'maint'
lisp/ox-html.el
lisp/ox-publish.el
testing/lisp/test-ox-publish.el