Skip to content
Commit 9b8ffaa2 authored by Tereza Vrabcová's avatar Tereza Vrabcová
Browse files

Merge branch 'develop' into 'check-style' 

# Conflicts:
#   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/rest/PlaneController.java
parents 471b7276 935d05fa
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment