# Conflicts:
#	car/pom.xml

Added Transactional

See merge request !46

20_list_of_spare_components

See merge request !44

Tests for driver

See merge request !45

fixed dependencies

See merge request !42

Race extended functionality

See merge request !41

Small fixes on car module

See merge request !40

Merge branch 'milestone_2' of https://gitlab.fi.muni.cz/xgulcik/pa165-formula-one-team into milestone_2

Client to call endpoints

See merge request !38

# 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

15 milestone 2 by tomas

See merge request !39