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

This commit is contained in:
Laurent Destailleur 2021-01-27 19:32:23 +01:00
commit b92d794f77

View File

@ -42,15 +42,15 @@ class WorkstationResource extends CommonObject
'fk_resource' => array ('type' => 'integer')
);
/**
* @var int ID of workstation
*/
public $fk_workstation;
/**
* @var int ID of workstation
*/
public $fk_workstation;
/**
* @var int ID of dolresource
*/
public $fk_resource;
/**
* @var int ID of dolresource
*/
public $fk_resource;
/**