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
..
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
pdf_strato.modules.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-03 13:00:39 +02:00