oms-HumanResourceManagement/Theme/Backend
Dennis Eichhorn d9fe7a618f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php
2017-01-26 16:42:29 +01:00
..
Lang Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
department-create.tpl.php Case fix! 2016-03-26 18:59:38 +01:00
department-list.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
department-single.tpl.php Case fix! 2016-03-26 18:59:38 +01:00
planning-dashboard.tpl.php Simplyfing layout 2016-05-17 20:14:04 +02:00
position-create.tpl.php Case fix! 2016-03-26 18:59:38 +01:00
position-list.tpl.php Case fix! 2016-03-26 18:59:38 +01:00
position-single.tpl.php Case fix! 2016-03-26 18:59:38 +01:00
staff-create.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
staff-list.tpl.php Adjusting copyright 2017-01-26 16:32:45 +01:00
staff-single.tpl.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00