aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-06-16 22:16:45 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-06-16 22:16:45 -0700
commitbec9f3c641e1376c0ef27d3df5a7b0a3fc7eee4f (patch)
tree53c00a7038058f04f82aab2d149f0851a538156d /COPYING
parent78ee2416d105bd25337819a49835623a8a296224 (diff)
parentc709cec0bdf7a3029a43f0c46d071a7ca1ab6a13 (diff)
downloadpandoc-bec9f3c641e1376c0ef27d3df5a7b0a3fc7eee4f.tar.gz
Merge branch 'docx' of https://github.com/jkr/pandoc into jkr-docx
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions