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

Merge remote-tracking branch 'origin/OZG-5778_entry-metadata' into OZG-6735_fim_metadata

# Conflicts:
#	fim-adapter/src/main/java/de/ozgcloud/eingang/fim/AntragstellerExtractor.java
#	fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimDataMapper.java
#	fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimSchemeAdapter.java
#	fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimService.java
#	fim-adapter/src/test/java/de/ozgcloud/eingang/fim/FimServiceITCase.java
parents ab8fd942 ccb1a87c
Branches
Tags
1 merge request!2Ozg 6735 fim metadata
Showing
with 466 additions and 209 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment