Laurent Destailleur 8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql

2022-03-19 17:34:26 +01:00

..

action

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop

2022-03-19 17:34:26 +01:00

admin

…

mailing

…

propal

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop

2022-03-19 17:34:26 +01:00

prospect

…

card.php

…

contact.php

…

index.php

…

multiprix.php

…

recap-client.php

…

remise.php

…

remx.php

…