Skip to content
Commit 138b6bf9 authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch 'master' into 'adapt-project-refactoring'

# Conflicts:
#   backend/src/main/java/cz/fidentis/web/taskparameters/TaskParametersApi.java
#   backend/src/main/java/cz/fidentis/web/taskparameters/dto/TaskParametersDistanceUpdateDto.java
#   backend/src/main/java/cz/fidentis/web/taskparameters/dto/TaskParametersRegistrationUpdateDto.java
parents 65158d73 e4f1fd99
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment