Skip to content
GitLab
Explore
Sign in
Register
nexedi
gitlab-ce
Repository
gitlab-ce
app
controllers
ldap
omniauth_callbacks_controller.rb
Find file
Blame
History
Permalink
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-25
· 71bae49f
GitLab Bot
authored
Sep 25, 2018
# Conflicts: # app/models/project_feature.rb # db/schema.rb [ci skip]
71bae49f
