summaryrefslogtreecommitdiff
path: root/README.markdown
diff options
context:
space:
mode:
authorJasper Van der Jeugt <jaspervdj@gmail.com>2010-01-18 19:30:43 +0100
committerJasper Van der Jeugt <jaspervdj@gmail.com>2010-01-18 19:30:43 +0100
commit06408148eef18707c32cad4d06e293c65962fe5c (patch)
tree9852933ccb577e00f28cd681486c44561bc93eec /README.markdown
parent673ed68b8fd41c9420d353e6efd11d5405e53360 (diff)
parente01531bd7593b871d8fb18c5ea509394eb8785ba (diff)
downloadhakyll-06408148eef18707c32cad4d06e293c65962fe5c.tar.gz
Merge branch 'master' of git://github.com/seschwar/Hakyll into experimental
Conflicts: hakyll.cabal src/Text/Hakyll/Page.hs src/Text/Hakyll/Render/Internal.hs
Diffstat (limited to 'README.markdown')
0 files changed, 0 insertions, 0 deletions