Laurent Destailleur 8821fbac76 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/product/fiche.php htdocs/user/class/user.class.php		2014-10-30 11:19:29 +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.6' into develop	2014-10-30 11:19:29 +01:00
usergroup.class.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00