Merge branch 'master' of github.com:jaspervdj/hakyll

Conflicts:
	web/examples.markdown
This commit is contained in:
Jasper Van der Jeugt 2014-06-10 11:11:24 +02:00
commit 9a97814d36

View File

@ -93,6 +93,8 @@ this list. This list has no particular ordering.
[source](https://github.com/listx/listx_blog)
- <http://kyle.marek-spartz.org>,
[source](https://github.com/zeckalpha/kyle.marek-spartz.org)
- <http://ladatura-corsets.com/>,
[source](https://github.com/dsferruzza/datura-corsets)
## Hakyll 3.X