diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-12-15 20:27:42 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-12-15 20:27:42 -0800 |
| commit | 8a3363a269cda134a60d5061e93d09363b5586af (patch) | |
| tree | dd942bd44b59cad1ea9af629c38383665f412e21 /src/Text/Pandoc/Readers/Markdown.hs | |
| parent | d5c7d66735006070fd1bfd1289d526380ea10d14 (diff) | |
| parent | 678aa315610e3d4e03d06dc39d79e99b587b35b5 (diff) | |
| download | pandoc-8a3363a269cda134a60d5061e93d09363b5586af.tar.gz | |
Merge branch 'patch-1' of https://github.com/Wikiwide/pandoc into Wikiwide-patch-1
Conflicts:
src/Text/Pandoc/Readers/LaTeX.hs
Diffstat (limited to 'src/Text/Pandoc/Readers/Markdown.hs')
0 files changed, 0 insertions, 0 deletions