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:
commit
a3526a2649
Conflicts: htdocs/core/actions_addupdatedelete.inc.php