Skip to content
Commit ad835a48 authored by Jan Pokorný's avatar Jan Pokorný 🏋🏼
Browse files

Merge branch 'M2' into 'M2-language-school-course-lecture'

# Conflicts:
#   application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
parents e54e5b84 ffe59998
Pipeline #206053 failed with stage
in 54 seconds
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment