Marcos García de La Fuente 87f97ed545 Merge branch 'develop' into units ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql htdocs/product/admin/product.php htdocs/product/card.php		2015-04-18 23:38:14 +02:00
..
commande.class.php	Merge branch 'develop' into units	2015-04-18 23:38:14 +02:00
commandestats.class.php	Removed closing php tag	2014-05-03 18:18:44 +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