Skip to content
Snippets Groups Projects
Commit e1d80b33 authored by Alexander Bergolth's avatar Alexander Bergolth
Browse files

Merge remote branch 'upstream/master' into ldap_nested_groups

parents 4fb16804 22abc53e
Show whitespace changes
Inline Side-by-side
Showing
with 7 additions and 19 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment