summaryrefslogtreecommitdiff
path: root/data/templates
blob: ab6b3f060dd1559381dcba05aca1669f4cbe8e0e (plain)
1
2
3
4
5
6
7
tree 98cfe11f71ce2d316ecb150bd16e08c1747759a0
parent 92f9d512a721f1e2feb00039d21dc075dcff41aa
parent c4ba8bab6248f8999e520547f1c45f10de85db9d
author John MacFarlane <jgm@berkeley.edu> 1485723983 +0100
committer John MacFarlane <jgm@berkeley.edu> 1485723983 +0100

Merge branch 'typeclass'