Laurent Destailleur 375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/fourn/paiement/card.php		2020-08-06 02:08:04 +02:00
..
index.html
pdf_standard.modules.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2020-08-06 02:08:04 +02:00