Laurent Destailleur 34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/fourn/class/paiementfourn.class.php		2020-12-08 18:14:56 +01:00
..
card.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-12-08 18:14:56 +01:00
index.html
info.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00