Laurent Destailleur a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ...

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php

2020-10-22 17:38:48 +02:00

..

card.php

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

2020-10-22 17:38:48 +02:00

index.html

…