Skip to content
Snippets Groups Projects
Commit 9d4673a5 authored by Mart van Santen's avatar Mart van Santen
Browse files

Fix conflict 

Merge branch '76-use-kratos-as-identity-manager' of open.greenhost.net:openappstack/single-sign-on into 76-use-kratos-as-identity-manager
parents 604a4c37 ac269a64
No related branches found
No related tags found
Pipeline #9098 failed with stages
in 53 seconds
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment