summaryrefslogtreecommitdiff
path: root/src/Hakyll/Web/Pandoc
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2013-03-11 15:53:00 +0100
committerJasper Van der Jeugt <m@jaspervdj.be>2013-03-11 15:53:00 +0100
commitd840363bf0edbbd703e1a7d2e2700c5feeedbbc6 (patch)
tree7f221ffab1025ab4c316ab404e73449fa8477f1d /src/Hakyll/Web/Pandoc
parent5c053d4c7106b5fe894263281ec7501ec5293bb6 (diff)
parentd6f6657c28f0ae4f82a249db0f6ce01482319713 (diff)
downloadhakyll-d840363bf0edbbd703e1a7d2e2700c5feeedbbc6.tar.gz
Merge remote-tracking branch 'piyush-kurur/master'
Conflicts: hakyll.cabal
Diffstat (limited to 'src/Hakyll/Web/Pandoc')
0 files changed, 0 insertions, 0 deletions