Laurent Destailleur 48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php

2021-02-09 14:08:49 +01:00

..

api_supplier_proposals.class.php

Scrutinizer Auto-Fixes

2020-10-31 17:51:30 +00:00

index.html

…

supplier_proposal.class.php

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

2021-02-09 14:08:49 +01:00