Laurent Destailleur 5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/translate.class.php		2020-09-12 04:29:28 +02:00
..
api_supplier_proposals.class.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
index.html
supplier_proposal.class.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2020-09-12 04:29:28 +02:00