Skip to content
Snippets Groups Projects
Verified Commit 6b514d1e authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

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

parents 16eaf34f 1fd6195e
No related branches found
No related tags found
1 merge request!501Resolve "Allow using Django-local accounts in addition to LDAP accounts"
Pipeline #7172 passed
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 369 additions and 55 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