Jingga/oms-HumanResourceManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-HumanResourceManagement.git synced 2026-02-15 12:18:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	Calendar/Models/CalendarMapper.php
This commit is contained in:
Dennis Eichhorn 2016-04-22 17:46:31 +02:00
commit d302ac5648
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Controller.php
View File

@ -22,6 +22,7 @@ use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\WebInterface; use phpOMS\Module\WebInterface;
use phpOMS\Views\View; use phpOMS\Views\View;
use phpOMS\Views\ViewLayout; use phpOMS\Views\ViewLayout;
use Modules\HumanResourceManagement\Models\EmployeeMapper;
/** /**
* Human Resources controller class. * Human Resources controller class.