Skip to content
Commit 08e10374 authored by Petr Wehrenberg's avatar Petr Wehrenberg
Browse files

Merge remote-tracking branch 'origin/feat/oauth2-okta' into feat/oauth2-okta 

# Conflicts:
#	module-user/src/main/resources/application.yml
parents eb8b1124 3c6e9b8f
Pipeline #232047 failed with stages
in 2 minutes and 5 seconds