summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2014-06-10 11:11:24 +0200
committerJasper Van der Jeugt <m@jaspervdj.be>2014-06-10 11:11:24 +0200
commit9a97814d3613f3135e6f7a4404dde71ea80d781f (patch)
tree2112763cd317db24d6221353d7bf9e54c88e66ee /LICENSE
parent8853b91c9131db58200cf50d2e488e7c7404fbbf (diff)
parent3fe8d6551b9390c647727aa99b416eab5cd80aaf (diff)
downloadhakyll-9a97814d3613f3135e6f7a4404dde71ea80d781f.tar.gz
Merge branch 'master' of github.com:jaspervdj/hakyll
Conflicts: web/examples.markdown
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions