aboutsummaryrefslogtreecommitdiff
path: root/tests/writer.mediawiki
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-12-03 23:31:03 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2010-12-03 23:43:47 -0800
commit357b965b4455422cfdeb2676befda31d017f944f (patch)
tree732d4ad686a0bacd2b50b60dc947aba7d84a020c /tests/writer.mediawiki
parentbea62bcab8ff095057a38eb2b8ecfaa3c9efb9e7 (diff)
parent38bc3f23166cc3b2088eebb8a234a3f5f5e65bbb (diff)
downloadpandoc-357b965b4455422cfdeb2676befda31d017f944f.tar.gz
Merge branch 'citeproc' into master.
Conflicts: src/Text/Pandoc/Definition.hs
Diffstat (limited to 'tests/writer.mediawiki')
0 files changed, 0 insertions, 0 deletions