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

Merge branch...

Merge branch 'refs/heads/OZG-5413-Senden-OD-Mantelantrag-an-AFM-Eingangsstelle-via-NB' into OZG-5415-Semantik-Adapter-Formbase

# Conflicts:
#	xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
parents 3e780f45 3875277b
No related branches found
No related tags found
Loading
Showing
with 156 additions and 93 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment