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

Conflicts:
	templates/admin/default/admin-layout.tpl

2013-09-10 15:46:51 +02:00

..

faker-assets

Merge branch 'master' into loops

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

.gitkeep

set execution right // no more troubles

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

faker_100categories_1000products_4locales.php

load test

2013-08-26 16:38:56 +02:00

faker.php

WIP

2013-09-09 21:43:58 +02:00

insert.sql

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

2013-09-10 15:46:51 +02:00

INSTALL-TODO.txt

Started product attributes management

2013-09-10 15:45:29 +02:00

thelia.sql

tax engine model

2013-09-09 11:01:31 +02:00