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

Merge remote-tracking branch 'origin/master' into OZG-5176-admin-rolle-fuer-berechtigung

# Conflicts:
#	src/test/java/de/ozgcloud/admin/RootModelAssemblerTest.java
#	src/test/java/de/ozgcloud/admin/settings/SettingsITCase.java
#	src/test/java/de/ozgcloud/admin/settings/postfach/PostfachITCase.java
parents 327105f1 47984640
Branches
Tags
No related merge requests found
Showing
with 278 additions and 29 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment