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

Conflicts:
	htdocs/compta/facture/card.php

2019-01-27 18:27:58 +01:00

..

api_users.class.php

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

2019-01-27 18:27:58 +01:00

index.html

…

user.class.php

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +01:00

userbankaccount.class.php

Squiz.Functions.FunctionDeclarationArgumentSpacing

2019-01-27 15:20:16 +01:00

usergroup.class.php

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +01:00