Laurent Destailleur 782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php

2016-08-05 00:42:40 +02:00

..

doc

…

index.html

…

mod_barcode_product_standard.php

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-08-05 00:42:40 +02:00

modules_barcode.class.php

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-08-05 00:42:40 +02:00