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_usergroup.class.php	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00