Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop Conflicts: htdocs/contrat/card.php htdocs/contrat/class/contrat.class.php
This commit is contained in:
parent
adb3062a9f
commit
7de92070d7
Loading…
Reference in New Issue
Block a user