aboutsummaryrefslogtreecommitdiff
path: root/tests/epub/img.epub
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-03-28 21:09:38 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-03-28 21:09:38 -0700
commit2d2e4c9ab2553752e2b8adc4d88c27f0daa3a36a (patch)
tree00b709cb678c23c9ee6b7c6cd3c140beff857aea /tests/epub/img.epub
parent27078985d54111ad5b674635dd3adc5ac5f86744 (diff)
parent58719551698dbb0f924101f128c7d0fafc3fd3d8 (diff)
downloadpandoc-2d2e4c9ab2553752e2b8adc4d88c27f0daa3a36a.tar.gz
Merge branch 'master' of https://github.com/rootzlevel/pandoc into rootzlevel-master
Conflicts: src/Text/Pandoc/Readers/Org.hs
Diffstat (limited to 'tests/epub/img.epub')
0 files changed, 0 insertions, 0 deletions