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

Merge branch 'master' of git.ozg-sh.de:mgm/pluto

# Conflicts:
#	pluto-interface/src/main/protobuf/vorgangmodel.proto
parents 53f28288 b340ad5f
No related branches found
No related tags found
No related merge requests found
Showing
with 171 additions and 54 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment