diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-04-17 19:21:07 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-04-17 19:23:13 -0700 |
| commit | 764f677530079d85078dfb5d3dd4cd367c905aeb (patch) | |
| tree | 4aaa8d1767e6165bcafccc8ce95ee5ae57a2cbec /Makefile | |
| parent | 28ca8566ab72e135d559e457e28d3f3f306a7b0e (diff) | |
| parent | 9557eb6f8efafaff2e3a61e43e4cc7e4717ad9eb (diff) | |
| download | pandoc-764f677530079d85078dfb5d3dd4cd367c905aeb.tar.gz | |
Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into jlduran-latex-tightlist
Conflicts:
data/templates
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions