Laurent Destailleur 58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php htdocs/langs/en_US/errors.lang		2021-08-22 01:41:18 +02:00
..
index.php	Fix restore dir at good place	2020-04-13 04:19:25 +02:00
newpayment.php	Fix phpcs	2021-08-22 01:21:31 +02:00
paymentko.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-06-19 20:05:25 +02:00
paymentok.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-08-22 01:41:18 +02:00