yogsototh/scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into next

Browse source 
Conflicts:
	output/Scratch/sitemap.xml
This commit is contained in:
Yann Esposito (Yogsototh) 2011-10-04 14:16:58 +02:00
commit 5239ac9b06
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
output/Scratch/assets/css/main.css
View file

File diff suppressed because one or more lines are too long

2
output/Scratch/en/blog/programming-language-experience/index.html
View file

@ -547,7 +547,7 @@ But I used all of these languages.</p>
</div>
<div id="lastmod">
Created: 09/28/2011
Modified: 09/30/2011
Modified: 10/03/2011
</div>
<div>
Entirely done with

2
output/Scratch/en/index.html
View file

@ -103,7 +103,7 @@
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
</div>
<div id="lastmod">
Modified: 09/30/2011
Modified: 10/03/2011
</div>
<div>
Entirely done with

2
output/Scratch/fr/index.html
View file

@ -148,7 +148,7 @@
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a>
</div>
<div id="lastmod">
modifié le : 30/09/2011
modifié le : 03/10/2011
</div>
<div>
Site entièrement réalisé avec

2
output/index.html
View file

@ -188,7 +188,7 @@
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
</div>
<div id="lastmod">
Modified: 09/30/2011
Modified: 10/03/2011
</div>
<div>
Entirely done with