// when adding a translation pack, do not install translations for modules that are not on the disk
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
[+] BO : AdminProducts add import products
[+] BO : AdminAttributes add import combinations
[+] BO : AdminSearchConf add import alias
[-] FO : Contact-form add translation for fields
[-] BO : AdminImages manufacturers/suppliers/stores image

• Missing logo Fashion_Manufacturer.jpg (small/medium/large)
install-dev/fixtures/fashion/img/m
• Missing logo Fashion_Supplier.jpg (small/medium/large)
install-dev/fixtures/fashion/img/su
[-] BO : AdminImport add image manufacturers
[-] BO : AdminImport add image suppliers
[-] BO : AdminImport products add missing fields

Add to file header : Width, Height, Depth, Minimal quantity, Visibility, Additional shipping cost, Unity, Unit price ratio
double ../../

correct ../
double ../

header.tpl=
{$css_dir}/jquery/uniform.default.css |
..homedir//jquery/uniform.default.css

ok=
{$css_dir}jquery/uniform.default.css |=
homedir/jquery/uniform.default.css
Merge pull request #1027 from wfpaisa/patch-4

double ../
Merge pull request #1025 from wfpaisa/patch-3

double ../../
// Manual merge from development branch
Merge pull request #1010 from indesign47/patch-8

[+] BO : AdminAttributes add import combinations
Merge pull request #1024 from indesign47/patch-20

[-] BO : AdminImport products add missing fields
// Changing Typo preserving backward compatibility
[+] MO : Add name value when hover color in blocklayered.tpl - Thanks @codeurWeb
// Fixed dashboard simulation mode switch