Laurent Destailleur 5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/ldap.php htdocs/commande/class/commande.class.php htdocs/commande/index.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/expedition/list.php htdocs/fourn/commande/list.php htdocs/fourn/facture/list.php htdocs/loan/list.php htdocs/product/class/product.class.php htdocs/supplier_proposal/list.php		2020-04-16 15:58:59 +02:00
..
doc	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-16 15:58:59 +02:00
index.html
mod_propale_marbre.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
mod_propale_saphir.php	Merge branch 'develop' into patch-11	2019-12-03 13:25:19 +01:00
modules_propale.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00