Laurent Destailleur 7d3325c087 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	dev/dolibarr_changes.txt
	htdocs/user/class/api_users.class.php

2017-11-25 13:17:38 +01:00

..

api_users.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-11-25 13:17:38 +01:00

index.html

…

user.class.php

NEW Can sort joined files on thirdparty and user card.

2017-11-10 18:14:29 +01:00

userbankaccount.class.php

Missing comments

2017-10-17 19:46:06 +02:00

usergroup.class.php

Work on module builder

2017-10-25 22:02:07 +02:00