diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2012-08-23 19:26:37 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2012-08-23 19:39:58 -0700 |
| commit | a6dcae1648e948bc984683639bf80173cf59ff7b (patch) | |
| tree | 1684cc78d29f7c99205457baeb2d2bf68487f829 /s5 | |
| parent | d7e658c6432bf4c820029eefb9779dca24a1ddaf (diff) | |
| parent | d25656571a4662a4e67b195daed69e77d80c4c2c (diff) | |
| download | pandoc-a6dcae1648e948bc984683639bf80173cf59ff7b.tar.gz | |
Merge commit 'd25656571a4662a4e67b195daed69e77d80c4c2c'
Conflicts:
src/Text/Pandoc/Writers/ODT.hs
Diffstat (limited to 's5')
0 files changed, 0 insertions, 0 deletions