Skip to content
Snippets Groups Projects
Commit 9b5985aa authored by tec's avatar tec
Browse files

Merge branch 'master' into 'expired_member'

# Conflicts:
#   src/ldap.rs
parents 9b26653c 62de747a
Pipeline #242 failed with stages
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