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

Merge branch 'master' of git.ozg-sh.de:ozgcloud-app/processor-manager 

# Conflicts:
#	pom.xml
#	src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
parents 760e3396 b9944a8e
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 17 additions and 8 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit