Laurent Destailleur 8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/paiement.php		2016-04-12 15:05:18 +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
margins.lib.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-12 15:05:18 +02:00