Laurent Destailleur c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php

2020-06-01 04:09:52 +02:00

..

mod_payment_ant.php

…

mod_payment_cicada.php

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

2020-06-01 04:09:52 +02:00

modules_payment.php

…