franck aa6fe04eec Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Core/Template/Element/BaseLoop.php

2013-07-09 11:45:01 +02:00

..

lib/Thelia

Merge branch 'master' of https://github.com/thelia/thelia

2013-07-09 11:45:01 +02:00

bootstrap.php

set execution right // no more troubles

2013-06-20 15:21:16 +02:00