Skip to content
GitLab
Explore
Sign in
Register
nexedi
gitlab-ce
Repository
gitlab-ce
app
controllers
omniauth_callbacks_controller.rb
Find file
Blame
History
Permalink
Merge branch 'better_ldap' of
https://github.com/jirutka/gitlabhq
into jirutka-better_ldap
· 366c0065
Dmitriy Zaporozhets
authored
Aug 21, 2012
Conflicts: app/models/user.rb
366c0065
