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

Merge branch '164-cannot-reset-password-if-2fa-is-active' into 163-improved-user-management

parents e4994e5e fd4b8dbf
No related branches found
No related tags found
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