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
..
2020-04-16 15:58:59 +02:00
2020-04-10 08:59:32 +00:00
2019-11-22 13:16:38 +00:00
2020-04-10 12:04:21 +02:00
2020-04-10 08:59:32 +00:00
2020-04-10 08:59:32 +00:00
2020-04-10 08:59:32 +00:00
2020-04-16 15:58:59 +02:00
2020-04-10 08:59:32 +00:00
2020-04-16 15:58:59 +02:00
2020-04-10 08:59:32 +00:00
2020-04-16 15:58:59 +02:00