touffies bbcda888cf Merge branch 'master' into frontend ...

Conflicts:
	templates/default/I18n/fr_FR.php

2013-11-06 09:58:34 +01:00

..

en_US.php

Add Placeholder

2013-11-05 15:50:25 +01:00

es_ES.php

Add Placeholder

2013-11-05 15:50:25 +01:00

fr_FR.php

complete french translation

2013-11-05 15:59:14 +01:00

it_IT.php

Add Placeholder

2013-11-05 15:50:25 +01:00