summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2014-12-01 11:20:46 +0100
committerJasper Van der Jeugt <m@jaspervdj.be>2014-12-01 11:20:46 +0100
commitb8ade61b5faa9fa7c68b43930db1b321af2b452d (patch)
tree567f768a09804bf70d2f488ef0a469304a29a73b /data
parentea4e7875de18855061007d2a5f10df8800e83c62 (diff)
parentbfe19727d21e93a35530892384b907413e93689a (diff)
downloadhakyll-b8ade61b5faa9fa7c68b43930db1b321af2b452d.tar.gz
Merge branch 'patch-1' of git://github.com/wei2912/hakyll into wei2912-patch-1
Conflicts: web/examples.markdown
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions