Laurent Destailleur be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php		2018-10-31 15:38:29 +01:00
..
doc	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-31 15:38:29 +01:00
index.html
mod_codeproduct_elephant.php	Fix return code	2017-11-17 15:27:59 +01:00
mod_codeproduct_leopard.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
modules_product.class.php	Fix duplicate deprecated file	2018-05-25 11:26:50 +02:00