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

Fix merge and conflict 

Merge branch '94-make-recovery-link-password-recovery-work-with-kratos' of open.greenhost.net:stackspin/single-sign-on into 94-make-recovery-link-password-recovery-work-with-kratos
parents b0d155d7 87d4ed3a
No related branches found
No related tags found
Pipeline #9799 failed with stage
in 45 seconds
Hide whitespace changes
Inline Side-by-side
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