diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-08-08 22:05:24 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-08-08 22:22:55 -0700 |
| commit | bc06ef0edb79b1b1fbaef8dffec223285ac72b3a (patch) | |
| tree | 024feb87a8a777fd8138c483216ae9257ad95a4a /.gitignore | |
| parent | 19daf6cf0a336e0ffa08b2fb0e0c9932d6fef2a6 (diff) | |
| parent | cfd8c0214c3f369d0f8c6f033325c343b78c7659 (diff) | |
| download | pandoc-bc06ef0edb79b1b1fbaef8dffec223285ac72b3a.tar.gz | |
Merge branch 'newbranch' of https://github.com/mpickering/pandoc into mpickering-newbranch
Conflicts:
src/Text/Pandoc/Readers/EPUB.hs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions