Skip to content
Snippets Groups Projects
Commit e2b1fb36 authored by Jan Zickermann's avatar Jan Zickermann
Browse files

Merge remote-tracking branch 'origin/master' into OZG-4799-SetupErrorReponseRFC7807 

# Conflicts:
#	pom.xml
#	src/main/java/de/ozgcloud/admin/Root.java
#	src/test/java/de/ozgcloud/admin/AdministrationApplicationTest.java
#	src/test/java/de/ozgcloud/admin/web/controller/BasicAppInfoControllerTest.java
parents adb065ec 27f26278
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 519 additions and 131 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit