summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2013-09-29 14:51:50 +0200
committerJasper Van der Jeugt <m@jaspervdj.be>2013-09-29 14:51:50 +0200
commit4948b56452fe48372b25283e1a6d0bdb9505a839 (patch)
tree14019924ba60fe8b26788d0142f4a25e645e62af /tests
parent5e2ec54b1be7fe91e197b0a19012d545cb188850 (diff)
parent48c579fd243ba6b32daa6f7115cd1b70dbc2345f (diff)
downloadhakyll-4948b56452fe48372b25283e1a6d0bdb9505a839.tar.gz
Merge remote-tracking branch 'piyush-kurur/master'
Conflicts: web/examples.markdown
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions