oms-Tasks/Models
Dennis Eichhorn daa39bfc89 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
..
NullTask.php Increase php version requirement 2016-12-07 20:56:15 +01:00
NullTaskElement.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Stats.php Init 2015-11-29 21:57:18 +01:00
Task.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskElement.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskElementMapper.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskMapper.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskPriority.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskStatus.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskTemplate.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskType.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
TaskVisibility.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00