Franck Allimant ca862b07e4 Merge branch 'master' into brands ...

Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql

2014-06-26 16:35:08 +02:00

..

faker-assets

rename /install dir

2014-04-17 17:49:15 +02:00

import

rename /install dir

2014-04-17 17:49:15 +02:00

update

Merge branch 'master' into brands

2014-06-26 16:35:08 +02:00

.gitkeep

rename /install dir

2014-04-17 17:49:15 +02:00

.htaccess

rename /install dir

2014-04-17 17:49:15 +02:00

faker_100categories_1000products_4locales.php

rename /install dir

2014-04-17 17:49:15 +02:00

faker_add_ecotax.php

rename /install dir

2014-04-17 17:49:15 +02:00

faker.php

Added brand creation

2014-06-26 15:49:46 +02:00

import.php

rename /install dir

2014-04-17 17:49:15 +02:00

insert.sql

Added brands management

2014-06-26 10:52:13 +02:00

INSTALL-TODO.txt

rename /install dir

2014-04-17 17:49:15 +02:00

tax_faker.php

rename /install dir

2014-04-17 17:49:15 +02:00

thelia.sql

Changed product_brand fk

2014-06-26 15:50:00 +02:00