Laurent Destailleur 4785e84c43 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php		2020-08-06 02:10:17 +02:00
..
card.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-06 02:10:17 +02:00
index.html
info.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00