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

Merge branch 'refs/heads/master' into...

Merge branch 'refs/heads/master' into OZG-6259-Anlegen-einer-ZusammenarbeitAnfrage-Edit-Add-comment-Assign-More-IN-PROGRESS-Export

# Conflicts:
#	Jenkinsfile
#	vorgang-manager-server/pom.xml
parents d4b93f16 2f9b9850
Branches
Tags
No related merge requests found
Showing
with 49 additions and 652 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment