Laurent Destailleur 10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php

2020-12-04 19:24:29 +01:00

..

index.html

…

opensurveysondage.class.php

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

2020-12-04 19:24:29 +01:00