Skip to content
Snippets Groups Projects
Commit 6b5bdb55 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'refs/heads/master' into OZG-6477-collaborations-anzeigen

# Conflicts:
#	alfa-server/src/main/resources/application-local.yml
#	alfa-server/src/main/resources/application.yml
#	alfa-service/pom.xml
#	pom.xml
#	src/main/helm/templates/deployment.yaml
#	src/test/helm/deployment_defaults_env_test.yaml
parents 8792c96b 36981c24
Branches
Tags
No related merge requests found
Showing
with 103 additions and 215 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment