# Conflicts:
#	doc/user/project/integrations/project_services.md
#	lib/api/services.rb
#	lib/gitlab/auth.rb
#	lib/gitlab/omniauth_initializer.rb
#	locale/gitlab.pot

[ci skip]