Laurent Destailleur 57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/index.php

2019-02-03 21:14:44 +01:00

..

api_users.class.php

get return array not int

2019-02-03 16:39:48 +01:00

index.html

…

user.class.php

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

2019-02-03 21:14:44 +01:00

userbankaccount.class.php

Move my email to the new one

2019-01-28 21:39:22 +01:00

usergroup.class.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00