Laurent Destailleur c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/class/ldap.class.php htdocs/expensereport/card.php htdocs/langs/en_US/admin.lang		2016-06-05 00:25:08 +02:00
..
api_commande.class.php	PHPCS again	2015-05-06 01:25:56 +02:00
commande.class.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-06-05 00:25:08 +02:00
commandestats.class.php	Fix SQL error on order stats	2016-06-02 12:37:37 +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