summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2013-05-03 11:27:36 +0200
committerJasper Van der Jeugt <m@jaspervdj.be>2013-05-03 11:27:36 +0200
commit6d47d9c895e368d1b730ef7abb0280db42b03d34 (patch)
treef99ba0358d905e1bf674f55cbba4fc42ad39b142 /tests
parent8f534400be335958fb67f558ce2d378509ae4d48 (diff)
parentd88ba8ac26d4090701f210bf6384b0b479b89f33 (diff)
downloadhakyll-6d47d9c895e368d1b730ef7abb0280db42b03d34.tar.gz
Merge remote-tracking branch 'jeffbr13/patch-1'
Conflicts: web/examples.markdown
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions