Skip to content
Commit feeb243a authored by Sabrina Orálková's avatar Sabrina Orálková
Browse files

Merge branch 'master' into 'UI-refactoring' 

# Conflicts:
#   GUI/src/main/java/cz/fidentis/analyst/gui/task/batch/distance/BatchDistanceAction.java
parents 08472980 29d9f4db
Expand all 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