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
..
contrat.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-03 13:00:39 +02:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00