Skip to content
Commit 8f12e10b authored by Andrej Žabka's avatar Andrej Žabka
Browse files

Merge branch 'develop' into 'departmentService-tests'

# Conflicts:
#   core/src/test/java/cz/muni/pa165/rest/CarComponentControllerTest.java
parents b82ea2de 7c024027
Pipeline #214455 failed with stages
in 40 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