Skip to content
Snippets Groups Projects
Commit e90912e1 authored by OZG-Cloud Team's avatar OZG-Cloud Team
Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into OZG-6054-Umstellung-auf-Multiple-XTA-Identifier

# Conflicts:
#	xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml
parents af0e7b36 303bc9b2
No related branches found
No related tags found
No related merge requests found
Showing
with 716 additions and 0 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment