mirror of
https://github.com/Karaka-Management/oms-HumanResourceManagement.git
synced 2026-01-30 04:38:41 +00:00
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # Calendar/Models/CalendarMapper.php
This commit is contained in:
commit
d302ac5648
|
|
@ -22,6 +22,7 @@ use phpOMS\Module\ModuleAbstract;
|
|||
use phpOMS\Module\WebInterface;
|
||||
use phpOMS\Views\View;
|
||||
use phpOMS\Views\ViewLayout;
|
||||
use Modules\HumanResourceManagement\Models\EmployeeMapper;
|
||||
|
||||
/**
|
||||
* Human Resources controller class.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user