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

Merge branch 'master' into OZG-6710-Update-common-lib

# Conflicts:
#	bescheid-manager/pom.xml
#	bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
#	vorgang-manager-server/pom.xml
parents d7c4b3b9 8cee4aba
Branches
Tags
No related merge requests found
Showing
with 848 additions and 154 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment