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

Merge branch 'refs/heads/master' into OZG-4771-Trustlevel-aus-intelliform-by-Formular-uebernehmen

# Conflicts:
#	intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/CustomHeaderReader.java
#	intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderReaderTest.java
#	intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderTestFactory.java
parents 9e25b9ce d8891d0f
No related branches found
No related tags found
Loading
Showing
with 526 additions and 749 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment