# Conflicts:
#	VERSION.txt

Resolve "An instance is able to be revived by updating end time"

See merge request !136

Develop

See merge request !135

Merge branch '114-disable-adding-updating-and-removing-tasks-to-a-training-definition-when-it-s-in-use' into 'develop'

Resolve "disable adding, updating and removing tasks to a training definition when it's in use"

See merge request !134

Merge branch 'develop' of https://gitlab.ics.muni.cz/muni-kypo-crp/backend-java/kypo-adaptive-training into develop

Merge branch '113-add-more-descriptive-error-message-when-a-training-phase-without-tasks' into 'develop'

Resolve "add more descriptive error message when a training phase without tasks"

See merge request !132

Merge branch 'develop' of https://gitlab.ics.muni.cz/muni-kypo-crp/backend-java/kypo-adaptive-training into develop

Add is answerRequired to QuestionViewDto

See merge request !131

Move question_required to different DTO

See merge request !130

Resolve "Add required field to adaptive question"

See merge request !128

Resolve "Add support for providing phase task answer in task solution"

See merge request !129

Develop

See merge request !127