Skip to content
GitLab
Explore
Sign in
Commit
366c0065
authored
Aug 21, 2012
by
Dmitriy Zaporozhets
Browse files
Merge branch 'better_ldap' of
https://github.com/jirutka/gitlabhq
into jirutka-better_ldap
Conflicts: app/models/user.rb
parents
b2b88b2f
335b3ed1
Loading
Loading
Loading
Changes
4