aboutsummaryrefslogtreecommitdiff
path: root/data/templates
blob: cddd99ccb2aad9056b16f712b4d37a2bbecdcf46 (plain)
1
2
3
4
5
6
7
8
9
tree 764b5f2782059c6551abfde580f5c999731ad713
parent 229ec44bb6ae116d5cf613bba0486f3757f9cd0d
parent def68fce50ab56ee33359aed9dee9a6de6bc1834
author John MacFarlane <jgm@berkeley.edu> 1444020163 -0700
committer John MacFarlane <jgm@berkeley.edu> 1444020163 -0700

Merge pull request #115 from xoolive/pr-tufte

 Deal with conflicts with tufte-handout.cls