diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-08-04 07:36:18 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-08-04 07:36:18 -0700 |
| commit | 4630cff2a6c116f1d474f459e6e759f5ce7f2003 (patch) | |
| tree | 5c52982b8f0615fadb69a0a105af9e1e60d51f25 /tests/docx.image_no_embed.native | |
| parent | 81335df9a51740631e75614c1279634f937d650a (diff) | |
| parent | cd9a5d90cbf93925db5bb9e9060ef40d05b4bfc8 (diff) | |
| download | pandoc-4630cff2a6c116f1d474f459e6e759f5ce7f2003.tar.gz | |
Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend
Conflicts:
pandoc.cabal
Diffstat (limited to 'tests/docx.image_no_embed.native')
0 files changed, 0 insertions, 0 deletions