Laurent Destailleur fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/modules/project/doc/pdf_baleine.modules.php htdocs/core/modules/project/doc/pdf_beluga.modules.php		2018-12-18 21:35:30 +01:00
..
doc	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-12-18 21:35:30 +01:00
mod_supplier_payment_brodator.php	Fix 7109 - class name already exist for customer payment	2017-07-05 16:52:37 +02:00
mod_supplier_payment_bronan.php	Fix regression db => this->db	2017-09-15 19:37:23 +02:00
modules_supplier_payment.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 18:32:34 +02:00