Etienne Roudeix 84204cbf05 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Feed.php

2013-09-16 15:32:17 +02:00

..

Resources

Merge branch 'master' into template

2013-09-16 15:32:17 +02:00

DatabaseConfiguration.php

apply cs-fixer

2013-08-14 09:29:04 +02:00

DefinePropel.php

apply cs-fixer

2013-08-14 09:29:04 +02:00