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

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

# Conflicts:
#	goofy-server/src/test/java/de/itvsh/goofy/common/user/UserManagerUrlProviderTest.java
parents 55cee60d ebcca3f1
No related merge requests found
Showing
with 100 additions and 69 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment