diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-02-16 13:01:57 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-02-16 13:01:57 +0100 |
| commit | 4c40cea9e1ddef01e25f135656551ef8d494cffb (patch) | |
| tree | 7c5f9d1983d9dfe0732c628a54d122f6b389679e /tests/data | |
| parent | 61dcb5f454fcbd912b09839021f4c79ca60973fe (diff) | |
| parent | 1c2804287a099b4ac2f6c2d9b3db452f7ef7bee1 (diff) | |
| download | hakyll-4c40cea9e1ddef01e25f135656551ef8d494cffb.tar.gz | |
Merge branch 'master' into dev-metadata-route
Conflicts:
tests/Hakyll/Core/Rules/Tests.hs
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/images/favicon.ico | bin | 0 -> 1150 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/data/images/favicon.ico b/tests/data/images/favicon.ico Binary files differnew file mode 100644 index 0000000..fc2cca2 --- /dev/null +++ b/tests/data/images/favicon.ico |