Laurent Destailleur 0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/card.php htdocs/compta/prelevement/line.php htdocs/core/class/commonobject.class.php htdocs/core/lib/functions2.lib.php htdocs/core/tpl/card_presend.tpl.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php		2020-10-22 17:55:38 +02:00
..
card.php	Renamed all methods valide() into validate()	2020-10-15 10:15:37 +02:00
index.html
info.php	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
payment.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-22 17:55:38 +02:00