scratch/multi
Yann Esposito (Yogsototh) ef059768a0 Merge branch 'master' into next
Conflicts:
	.gitignore
	Rules
	img_latest_blog_dir
	latest.ymd
	output/Scratch/en/blog/2010-05-24-Trees--Pragmatism-and-Formalism/graph/The_destination_tree.png
	output/Scratch/en/blog/2010-05-24-Trees--Pragmatism-and-Formalism/graph/The_source_tree.png
	output/Scratch/en/blog/Haskell-OpenGL-Mandelbrot/index.html
	output/Scratch/en/blog/feed/feed.xml
	output/Scratch/fr/blog/2010-05-24-Trees--Pragmatism-and-Formalism/graph/The_destination_tree.png
	output/Scratch/fr/blog/2010-05-24-Trees--Pragmatism-and-Formalism/graph/The_source_tree.png
	output/Scratch/fr/blog/Haskell-OpenGL-Mandelbrot/index.html
	output/Scratch/fr/blog/feed/feed.xml
	output/Scratch/sitemap.xml
	output/index.html
2013-01-02 16:29:24 +01:00
..
about updated some details 2012-09-20 14:17:16 +02:00
blog Merge branch 'master' into next 2013-01-02 16:29:24 +01:00
softwares updated widget version 2012-09-16 12:45:41 +02:00
about.md centralized the cv 2012-09-20 13:56:52 +02:00
blog.erb Updated the blog layout! 2012-04-24 18:14:14 +02:00
index.erb Update slightly my homepage 2012-04-24 16:33:15 +02:00
latest.md Managed latest blog post automatically 2012-01-20 11:16:02 +01:00
softwares.md Regen 2011-04-20 16:46:03 +02:00