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

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

# Conflicts:
#	pluto-server/src/main/resources/application-local.yml
parents 550834fa 62cb4927
Branches
Tags
No related merge requests found
Showing
with 428 additions and 181 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment