Skip to content
Commit a324c7aa authored by Petr Kabelka's avatar Petr Kabelka
Browse files

Merge branch 'main' into 'monitoring' 

# Conflicts:
#   movie/src/main/resources/application.yml
parents 867baed1 a80eb352
Pipeline #331234 passed with stages
in 6 minutes and 39 seconds