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

Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
This commit is contained in:
Laurent Destailleur 2021-07-14 14:46:05 +02:00
commit a3526a2649

Diff Content Not Available