diff options
author | John MacFarlane <fiddlosopher@gmail.com> | 2013-09-24 19:56:55 -0700 |
---|---|---|
committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-09-24 19:56:55 -0700 |
commit | b97f1136cd089c17123a264a8b3e0fcf657fc5fc (patch) | |
tree | 8b7e63c03a63682aa39ac1d0ea29bb402503a313 /data | |
parent | f9430e995eaca8eb9f92d470de703e998197b26f (diff) | |
parent | a117a881379ca2863bb9adb39cd83a6c4003be56 (diff) | |
download | pandoc-b97f1136cd089c17123a264a8b3e0fcf657fc5fc.tar.gz |
Merge branch 'master' of github.com:jgm/pandoc
Diffstat (limited to 'data')
m--------- | data/templates | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/data/templates b/data/templates -Subproject 1ccb16bb33e8022c9511284e6718386efa3a0bb +Subproject 0bb5f9ba204ea242e361c264f019490ead1cf31 |