Skip to content
Commit fa085849 authored by Diana Gulčíková's avatar Diana Gulčíková
Browse files

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
parents aeb71058 c39085e3
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