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

Conflicts:
	htdocs/admin/translation.php

2018-01-11 01:14:20 +01:00

..

doc

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

2018-01-11 01:14:20 +01:00

modules_user.class.php

NEW odt usergroup

2017-03-08 11:34:21 +01:00