Files
dolibarr/htdocs/contrat
Laurent Destailleur 0479bd5a59 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/modAdherent.class.php
2015-05-03 13:00:39 +02:00
..
2015-01-24 21:46:05 +01:00
2015-04-18 23:17:44 +02:00