Skip to content
Commit 539b946d authored by Ján Repka's avatar Ján Repka
Browse files

Merge branch 'dev' into 'airplane'

# Conflicts:
#   .gitignore
#   core/src/main/java/cz/muni/fi/pa165/core/dto/AirplaneDto.java
#   core/src/main/java/cz/muni/fi/pa165/core/dto/DestinationDto.java
#   core/src/main/java/cz/muni/fi/pa165/core/dto/FlightDto.java
#   core/src/main/java/cz/muni/fi/pa165/core/dto/StaffDto.java
#   modules/airplane/pom.xml
#   modules/airplane/src/main/java/cz/muni/fi/pa165/airplane/service/AirplaneController.java
#   modules/airplane/src/main/java/cz/muni/fi/pa165/airplane/service/AirplaneService.java
#   modules/destination/pom.xml
#   modules/destination/src/main/java/cz/muni/fi/pa165/destination/service/DestinationController.java
#   modules/destination/src/main/java/cz/muni/fi/pa165/destination/service/DestinationService.java
#   modules/staff/pom.xml
#   modules/staff/src/main/java/cz/muni/fi/pa165/staff/service/StaffController.java
#   modules/staff/src/main/java/cz/muni/fi/pa165/staff/service/StaffService.java
parents 68c8cba3 5fff2955
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment