Skip to content
Verified Commit 6b514d1e authored by Tom Teichler's avatar Tom Teichler 🍻
Browse files

Merge branch 'master' into 389-allow-using-django-local-accounts-in-addition-to-ldap-accounts

parents 16eaf34f 1fd6195e
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