aboutsummaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-07-07 16:15:35 -0600
committerJohn MacFarlane <jgm@berkeley.edu>2014-07-07 16:15:35 -0600
commit616cf6c539eaa9c9dd2808492cf4d94cba9c9a32 (patch)
treeb1b25e37e12423bced4f0bed8dd357995d6d58de /data/templates
parente4263d306e6988dd322c895242eb818d22b9e012 (diff)
parent5e25bff392c9504752c0ce5752d6e7f364c35b46 (diff)
downloadpandoc-616cf6c539eaa9c9dd2808492cf4d94cba9c9a32.tar.gz
Merge branch 'dokuwiki' of https://github.com/claremacrae/pandoc into claremacrae-dokuwiki
Diffstat (limited to 'data/templates')
m---------data/templates13
1 files changed, 8 insertions, 5 deletions
diff --git a/data/templates b/data/templates
-Subproject f3b3f2dda6737b9c6af03e1f470186139403277
+Subproject 95f515decb05a77ea8d37c5bb9f13203f09bc32