diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-08-30 11:49:50 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-08-30 11:49:50 -0700 |
| commit | f70e3c3297bb0d8f953971a84a1a606351fdda40 (patch) | |
| tree | c95d0f44861578c828aabcade0d0584b25d5eb96 /changelog | |
| parent | eb29aab9598eec04a8c2d37ef24f2eaa5ca1435d (diff) | |
| parent | 357172f13af7e7ddb6a01e16c664776d01f55565 (diff) | |
Merge branch 'mime' of https://github.com/Aelve/John into Aelve-mime
Conflicts:
src/Text/Pandoc/Writers/Docx.hs
Diffstat (limited to 'changelog')
0 files changed, 0 insertions, 0 deletions