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

No related branches found

No related tags found

Pipeline #

Hide whitespace changes

Inline Side-by-side

Showing with 342 additions and 227 deletions

Please register or to comment