Skip to content
Commit 02851dd0 authored by Martin Kyjac's avatar Martin Kyjac
Browse files

Merge branch 'dev' into 'm2-podman-integration' 

# Conflicts:
#   winery/store-wine/pom.xml
#   winery/user-management/src/main/resources/application.properties
#   winery/wine-production/src/main/resources/application.properties
parents 2e753501 a92386c2
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