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

Conflicts:
	templates/default/I18n/fr_FR.php

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

..

lib/Thelia

Merge branch 'master' into frontend

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

bootstrap.php

fix issue on command line when thelia is still not installed

2013-11-04 12:13:26 +01:00