Laurent Destailleur 7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/class/fournisseur.commande.dispatch.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/reception/class/reception.class.php		2020-04-24 18:58:47 +02:00
..
doc_generic_task_odt.modules.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-24 18:58:47 +02:00
index.html