Etienne Roudeix 66536d0b31 Merge branch 'master' into template ...

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

2013-09-18 20:03:13 +02:00

..

Cheque

payment modules

2013-09-18 17:06:08 +02:00

Colissimo

payment modules

2013-09-18 17:06:08 +02:00

FakeCB

payment modules

2013-09-18 17:06:08 +02:00

TheliaDebugBar

Merge branch 'master' into template

2013-09-18 20:03:13 +02:00

.gitkeep

set execution right // no more troubles

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