franck d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php

2013-09-18 00:35:48 +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

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

schema.xml

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-18 00:35:48 +02:00