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
Please register or sign in to comment