Manuel Raynaud 7e5c296fb2 Merge branch 'cart' ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php

2013-08-08 10:11:22 +02:00

..

.gitkeep

set execution right // no more troubles

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

faker.php

Merge branch 'master' into cart

2013-08-07 10:23:44 +02:00

insert.sql

Added category creation and deletion

2013-08-08 02:39:42 +02:00

INSTALL-TODO.txt

complete INTALL-TODO

2013-08-07 10:20:04 +02:00

thelia.sql

Merge branch 'cart'

2013-08-08 10:11:22 +02:00