Skip to content
Snippets Groups Projects
Commit 6c0f0ef6 authored by Tomáš Marek's avatar Tomáš Marek
Browse files

Merge branch 'milestone_2' into 13_fixes_by_tomas2

# Conflicts:
#	car/src/main/java/cz/muni/pa165/car/data/repository/CarRepository.java
#	car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerItTest.java
#	car/src/test/java/cz/muni/pa165/car/rest/DriverManagerControllerUnitTest.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Car.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/CarComponent.java
#	common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Driver.java
parents 0485fef3 fff9d171
No related branches found
No related tags found
2 merge requests!60Docker,!2813 fixes by tomas2
Showing
with 322 additions and 179 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment