Skip to content
Snippets Groups Projects
Commit a30bb758 authored by Karol Beyrowski's avatar Karol Beyrowski
Browse files

Merge branch 'develop' into '34-improve-properties-file-handling-for-docker-deployment'

# Conflicts:
#   src/main/resources/application.properties
parents 3f7c15bb 4f6d7828
Branches
Tags
1 merge request!9update properties for docker flags
Pipeline #87535 passed