Laurent Destailleur 4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php

2017-03-19 11:26:49 +01:00

..

api_deprecated_user.class.php

Fix several problems on new REST API on project/tasks

2016-11-19 16:08:27 +01:00

api_users.class.php

Fix return code REST similar for all api with POST

2016-12-23 02:08:22 +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 branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-19 11:26:49 +01:00

userbankaccount.class.php

Merge remote-tracking branch 'origin/3.9' into develop

2016-07-01 02:39:29 +02:00

usergroup.class.php

Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects

2017-03-10 12:16:55 +01:00