Laurent Destailleur 38233ca05d Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/admin/limits.php htdocs/commande/class/commande.class.php htdocs/compta/facture.php htdocs/core/ajax/ziptown.php		2014-09-02 13:46:47 +02:00
..
commande.class.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-02 13:46:47 +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