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
..
class	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-13 15:16:55 +02:00
stats	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
tpl	Scrutinizer Auto-Fixes	2019-11-22 13:16:38 +00:00
card.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-14 21:58:13 +02:00
contact.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
document.php	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +01:00
index.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
list.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-04-16 15:58:59 +02:00
note.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
shipment.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00