Laurent Destailleur 95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/commande/card.php htdocs/emailcollector/class/emailcollector.class.php htdocs/index.php htdocs/website/index.php		2022-08-10 13:16:02 +02:00
..
index.php	Fix restore dir at good place	2020-04-13 04:19:25 +02:00
newpayment.php	Bugfix: regression, keep newamount equal to amount for the payment	2022-06-30 00:39:13 +02:00
paymentko.php	HTML5 - <font> tag is deprecated, replace by <span>	2021-10-05 10:01:37 +02:00
paymentok.php	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-08-10 13:16:02 +02:00