Skip to content
Commit 07b203d1 authored by Andreas Pflug's avatar Andreas Pflug
Browse files

Merge branch 'master' of https://github.com/nextcloud/server into ldap_no-memberof-with-memberuid

parents b64e4833 e50320dc
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