Laurent Destailleur 90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/translation.php

2018-01-11 01:14:20 +01:00

..

doc

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-01-11 01:14:20 +01:00

index.html

…

mod_codeproduct_elephant.php

Fix return code

2017-11-17 15:27:59 +01:00

mod_codeproduct_leopard.php

…

modules_product.class.php

NEW generation ODT

2017-01-06 16:44:09 +01:00

modules_product.php

add edition feacture on product element

2016-02-04 16:12:00 +01:00