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
Loading
Please sign in to comment