Franck Allimant d1c54ea62a Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php

2013-10-30 19:55:10 +01:00

..

admin/default

Merge branch 'catalog'

2013-10-30 19:55:10 +01:00

default

remove temporary home carousel

2013-10-30 12:19:14 +01:00

pdf

save website url in install process

2013-10-24 19:45:51 +02:00

.gitkeep

set execution right // no more troubles

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