summaryrefslogtreecommitdiff
path: root/web/tutorials/02-basics.markdown
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2012-05-17 11:47:24 +0200
committerJasper Van der Jeugt <m@jaspervdj.be>2012-05-17 11:47:24 +0200
commit962e8ab32ab62daaf92069bfec0e1de8384d7494 (patch)
tree2bedb1cdffca2026776855b29244801333f399df /web/tutorials/02-basics.markdown
parent778bb52b38e9695acd6f4f933218b5d5231221a8 (diff)
parent84b5b16108e73d79c882f1e5ff7bebd7fa85c5ac (diff)
downloadhakyll-962e8ab32ab62daaf92069bfec0e1de8384d7494.tar.gz
Merge branch 'stable'
Conflicts: hakyll.cabal
Diffstat (limited to 'web/tutorials/02-basics.markdown')
0 files changed, 0 insertions, 0 deletions