Skip to content
Commit fb94ace7 authored by mriedl's avatar mriedl
Browse files

Merge branch 'UG-initialisation' into WP1-changes 

# Conflicts:
#	interfaces/src/main/resources/services/process/process.raml
#	mule_esb/mule-integration/src/main/api/api.raml
#	process/src/main/resources/melodicApplicationDeployment.bpmn
parents bc1660b8 01558b87
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment