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:
Laurent Destailleur 2019-06-29 16:46:16 +02:00
parent adb3062a9f
commit 7de92070d7
16 changed files with 0 additions and 0 deletions