| commit | f0ff257fa766aa7751dc0b67f7afb61490e67e56 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 27 Jun 2016 22:31:09 +0000 (28 00:31 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 27 Jun 2016 22:31:09 +0000 (28 00:31 +0200) | ||
| tree | 89704965139792ce4d2b1925b1b05242751b3fbc | treesnapshot (tar.gz zip) |
| parent | 8285ff4cf24c9a99b2922ce6993e269c7c9990af | commitdiff |
| parent | 07de65e1ea3eda43e6fa8bec84309e9464a09ab6 | commitdiff |
Merge branch 'maint'
| lisp/ox.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-ox.el | diff1 | diff2 | blobhistory |