Skip to content
Commit 6acf729c authored by Daniel Chudý's avatar Daniel Chudý
Browse files

Merge branch 'milestone-1' into '30-airplane-availability-flight' 

# Conflicts:
#   flight/src/main/java/cz/muni/fi/pa165/flight/FlightApp.java
#   flight/src/main/java/cz/muni/fi/pa165/flight/rest/FlightController.java
#   flight/src/main/java/cz/muni/fi/pa165/flight/service/FlightService.java
parents 2551cd82 0edac2a3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment