Laurent Destailleur 7de92070d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php

2019-06-29 16:46:16 +02:00

..

index.html

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

2019-06-29 16:46:16 +02:00

linkedobjectblock.tpl.php

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

2019-06-29 16:46:16 +02:00