Merge branch 'milestone_2' into client_to_call_endpoints
# Conflicts: # common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverInsightDto.java # common_library/src/main/resources.mv.db # driver/src/main/java/cz/muni/pa165/driver/data/model/Driver.java # driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java
Please register or sign in to comment