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

Merge branch 'milestone_2' into client_to_call_endpoints

# Conflicts:
#	car/src/main/java/cz/muni/pa165/car/App.java
#	car/src/main/java/cz/muni/pa165/car/rest/CarController.java
#	common_library/src/main/java/cz/muni/pa165/common_library/client/ClientConfig.java
parents fcc12099 817e1f95
Pipeline #214367 passed with stages
in 5 minutes and 16 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