Skip to content
Snippets Groups Projects
Commit 5f7568bb authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-4606-userprofile-service

# Conflicts:
#	api-lib-core/pom.xml
#	ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
parents 8be728f2 eca498a6
Branches
Tags
Loading
Showing
with 50 additions and 51 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment