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

Merge remote-tracking branch 'origin/master' into OZG-6179-Trustlevelberuecksichtigen 

# Conflicts:
#	nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Decrypter.java
parents 7669fa33 7cf23844
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 390 additions and 87 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit