Laurent Destailleur a1567778ab Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/commande/card.php		2015-03-06 18:51:55 +01:00
..
categorie.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-03-06 18:51:55 +01: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