Laurent Destailleur b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php		2015-10-16 10:12:36 +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
margin.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-10-16 10:12:36 +02:00