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

..

Colissimo

cart integration

2013-09-16 14:31:34 +02:00

DebugBar

fix faker script

2013-09-16 12:15:04 +02:00

.gitkeep

set execution right // no more troubles

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