aboutsummaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-09-24 19:56:55 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-09-24 19:56:55 -0700
commitb97f1136cd089c17123a264a8b3e0fcf657fc5fc (patch)
tree8b7e63c03a63682aa39ac1d0ea29bb402503a313 /data/templates
parentf9430e995eaca8eb9f92d470de703e998197b26f (diff)
parenta117a881379ca2863bb9adb39cd83a6c4003be56 (diff)
downloadpandoc-b97f1136cd089c17123a264a8b3e0fcf657fc5fc.tar.gz
Merge branch 'master' of github.com:jgm/pandoc
Diffstat (limited to 'data/templates')
m---------data/templates13
1 files changed, 5 insertions, 8 deletions
diff --git a/data/templates b/data/templates
-Subproject 1ccb16bb33e8022c9511284e6718386efa3a0bb
+Subproject 0bb5f9ba204ea242e361c264f019490ead1cf31