Laurent Destailleur e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/boxes/box_services_contracts.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php		2020-10-15 21:00:49 +02:00
..
pdf_standard.modules.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-10-15 21:00:49 +02:00