diff options
author | Jasper Van der Jeugt <m@jaspervdj.be> | 2014-08-27 11:41:49 +0200 |
---|---|---|
committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2014-08-27 11:41:49 +0200 |
commit | d078833b763a6a1ce4b03f73998a2e709558bbcc (patch) | |
tree | b52c7ff463a52ea245a121383bf3ce4df0acf461 /web/templates | |
parent | 6673c25628ff166536dd3c4deb75c5df2c65c27e (diff) | |
parent | fae250b24f809b484c316a1776b7254186965780 (diff) | |
download | hakyll-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