| commit | 80e493a1f7b839525410e6eed940a3b78774d2e1 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 18 Sep 2014 20:08:30 +0000 (18 22:08 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 18 Sep 2014 20:08:30 +0000 (18 22:08 +0200) | ||
| tree | 3c5d2daa8c17a758ebe425fd139ce0bedfd3113c | treesnapshot (tar.gz zip) |
| parent | 0fd29a5ee7d14c3695b22998196373b9a3637413 | commitdiff |
| parent | 873fe4981193581f344f1999c6b53c6be216b43d | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox-html.el
Conflicts:
lisp/ox-html.el
| lisp/ox-html.el | diff1 | diff2 | blobhistory |