Commit a74e15f4 authored by danielkisov's avatar danielkisov
Browse files

Merge branch 'master' into 'ba_kisov'

# Conflicts:
#   pom.xml
parents f5b5f55b edf2a818
Pipeline #464943 failed with stage
in 34 seconds