diff options
| author | Vaclav Zeman <vhaisman@gmail.com> | 2014-02-09 13:16:39 +0100 |
|---|---|---|
| committer | Vaclav Zeman <vhaisman@gmail.com> | 2014-02-09 13:16:39 +0100 |
| commit | 1ba8066f67d1f8624e679e28fd800e6ade2a9511 (patch) | |
| tree | 4bdd9c34936f7be77b95aaf4df723980aa675a25 /data/templates | |
| parent | 3f0fe345f9aa69d1faf36e6a6f913013f21b3749 (diff) | |
| parent | 927b51630852b56f6c8e0aa4a7763108fdb8ec89 (diff) | |
| download | pandoc-1ba8066f67d1f8624e679e28fd800e6ade2a9511.tar.gz | |
Merge remote-tracking branch 'origin/master' into en-dash-ligature-avoidance.
Diffstat (limited to 'data/templates')
| m--------- | data/templates | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/data/templates b/data/templates -Subproject 4bdebc73b0b2025cf01704e7e564088c34d8f86 +Subproject 50ca8c85d9abfb7918cb78015bcc6d6fec02ce7 |