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

# Conflicts:
#	Calendar/Models/CalendarMapper.php
This commit is contained in:
Dennis Eichhorn 2016-04-22 17:46:31 +02:00
commit d302ac5648

View File

@ -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.