Skip to content
GitLab
Explore
Sign in
Register
nexedi
gitlab-ce
Repository
gitlab-ce
lib
gitlab
ldap
group.rb
Find file
Blame
History
Permalink
Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync
· 9b678226
Jan-Willem van der Meer
authored
Oct 15, 2014
Conflicts: db/schema.rb lib/api/ldap.rb
9b678226
