Laurent Destailleur 48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ...

Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php

2021-04-27 01:58:19 +02:00

..

cpaiement.class.php

Fix phpcs

2020-04-26 23:18:09 +02:00

index.html

…

paiement.class.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

2021-04-27 01:58:19 +02:00