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

Merge branch 'master' into OZG-6522-Mehrere-Postfachkonfigurationen-erlauben 

# Conflicts:
#	nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/postfach/PostfachService.java
#	nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachServiceTest.java
parents f00bffbc 5c123c41
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 230 additions and 16 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit