summaryrefslogtreecommitdiff
path: root/web/templates
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2014-08-27 11:41:49 +0200
committerJasper Van der Jeugt <m@jaspervdj.be>2014-08-27 11:41:49 +0200
commitd078833b763a6a1ce4b03f73998a2e709558bbcc (patch)
treeb52c7ff463a52ea245a121383bf3ce4df0acf461 /web/templates
parent6673c25628ff166536dd3c4deb75c5df2c65c27e (diff)
parentfae250b24f809b484c316a1776b7254186965780 (diff)
downloadhakyll-d078833b763a6a1ce4b03f73998a2e709558bbcc.tar.gz
Merge branch 'patch-1' of git://github.com/ruud-v-a/hakyll into ruud-v-a-patch-1
Conflicts: web/examples.markdown
Diffstat (limited to 'web/templates')
0 files changed, 0 insertions, 0 deletions