Laurent Destailleur e99f115a8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/tables/llx_user.sql		2016-09-28 19:49:36 +02:00
..
api_deprecated_user.class.php	REST API: Add comments in the @deprecated tags.	2016-06-22 10:43:35 +02:00
api_users.class.php	Uniformize code.	2016-09-26 02:13:58 +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
user.class.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2016-09-28 19:49:36 +02:00
userbankaccount.class.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-07-01 02:39:29 +02:00
usergroup.class.php	Simplification + reprise du vrai DN de l'utilisateur (gestion multi domaine par exemple)	2016-06-16 23:39:59 +02:00