Laurent Destailleur f8bd7946a5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/supplier_proposal/class/supplier_proposal.class.php		2020-08-29 05:13:20 +02:00
..
pdf_standard.modules.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-08-29 05:13:20 +02:00