Skip to content
Snippets Groups Projects
Commit 7a5f794f authored by OZG-Cloud Team's avatar OZG-Cloud Team
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 8c2c129a bd90c8d1
No related branches found
No related tags found
No related merge requests found
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