diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-03-28 21:09:38 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-03-28 21:09:38 -0700 |
| commit | 2d2e4c9ab2553752e2b8adc4d88c27f0daa3a36a (patch) | |
| tree | 00b709cb678c23c9ee6b7c6cd3c140beff857aea /tests/media | |
| parent | 27078985d54111ad5b674635dd3adc5ac5f86744 (diff) | |
| parent | 58719551698dbb0f924101f128c7d0fafc3fd3d8 (diff) | |
| download | pandoc-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/media')
0 files changed, 0 insertions, 0 deletions