Skip to content
Snippets Groups Projects
Commit 37119dec authored by Jan Zickermann's avatar Jan Zickermann
Browse files

Merge branch 'refs/heads/master' into OZG-5156-Nur-Xdomea-Abhaengigkeit-Ausbauen 

# Conflicts:
#	xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
#	xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
parents 1b7177fa a16a5c7c
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 127 additions and 48 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit