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

.htaccess

set execution right // no more troubles

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

build.properties.sample

set execution right // no more troubles

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

database.yml.sample

set x right to 7

2013-07-09 11:59:37 +02:00

schema.xml

Merge branch 'cart'

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