Laurent Destailleur 6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ...

Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php

2021-07-02 16:14:12 +02:00

..

originproductline.tpl.php

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

2021-07-02 16:14:12 +02:00