Laurent Destailleur fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/main.inc.php		2015-01-09 23:09:10 +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
user.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-09 23:09:10 +01:00
usergroup.class.php	Fix: Param $action was not defined.	2014-11-15 19:04:21 +01:00