Commit 5ceb875a authored by Alex Segers's avatar Alex Segers

Merge branch 'dev' into 'feature/manager_model'

# Conflicts:
#   backend/order-management/pom.xml
parents f4441680 e7b8d407
Pipeline #1664 failed with stage