Merge branch 'maint'
commitf45caca6081bc5b61a581eaace3314761a4736d0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 21 May 2019 08:17:37 +0000 (21 10:17 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 21 May 2019 08:17:37 +0000 (21 10:17 +0200)
tree85a14b1ec55c146dff4e2cdcd992bf95b82f5dc3
parent84a4b73fd6a16a0884b3f7c7fc3946f51647c336
parent31873ed27d96e3159ccf5fab4e41a549232700b5
Merge branch 'maint'
lisp/ox-html.el