| commit | 7404e3d22a3a7705d04a180f3f659f63266c9384 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Tue, 10 Jan 2017 23:27:07 +0000 (11 00:27 +0100) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Tue, 10 Jan 2017 23:27:07 +0000 (11 00:27 +0100) | ||
| tree | 98e0ef1074344b0de43b2cdc604170ad0670b355 | treesnapshot (tar.gz zip) |
| parent | e46676bd1337f57038e8625f9dcf79e1fa490308 | commitdiff |
| parent | a0409e56c3e4e9e8746235f6c0841a701a2f57a2 | commitdiff |
Merge branch 'maint'
| lisp/ox.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-ox.el | diff1 | diff2 | blobhistory |