Manuel Raynaud 376471db04 Merge branch 'cart' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-08-08 18:03:23 +02:00

..

admin/default

Category visibility toggle implementation

2013-08-08 10:12:14 +02:00

default

Merge branch 'cart'

2013-08-08 18:03:23 +02:00

.gitkeep

set execution right // no more troubles

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