summaryrefslogtreecommitdiff
path: root/tests/TestSuite
diff options
context:
space:
mode:
authorJasper Van der Jeugt <jaspervdj@gmail.com>2011-06-08 15:53:36 +0200
committerJasper Van der Jeugt <jaspervdj@gmail.com>2011-06-08 15:53:36 +0200
commitd08a33a28791a2c0cbf39abb59b7770abe20ebb0 (patch)
tree69018b3462ddef1cff3f6c4a43a24bde09792ab0 /tests/TestSuite
parenta6329a577bf38dff1fc9ff515e0a80023a38ee3a (diff)
parent699a4e111309278495eda50cabe678354864a449 (diff)
downloadhakyll-d08a33a28791a2c0cbf39abb59b7770abe20ebb0.tar.gz
Merge branch 'master' into type-safe-identifiers
Conflicts: hakyll.cabal
Diffstat (limited to 'tests/TestSuite')
0 files changed, 0 insertions, 0 deletions