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

Merge branch 'dev' into 'airplane_test' 

# Conflicts:
#   modules/airplane/pom.xml
#   modules/airplane/src/test/java/cz/muni/fi/pa165/airplane/AirplaneApplicationTests.java
parents 99cf9155 11241a13
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