Skip to content
Commit f5cd2cd8 authored by Jean Dossa Tsimbazafy's avatar Jean Dossa Tsimbazafy
Browse files

Merge branch 'dev' into 'destination-tests'

# Conflicts:
#   modules/flight/src/main/java/cz/muni/fi/pa165/flight/data/Flight.java
#   modules/flight/src/main/java/cz/muni/fi/pa165/flight/service/FlightController.java
#   modules/flight/src/main/java/cz/muni/fi/pa165/flight/service/FlightService.java
parents a480f24d a9d0b8f5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment