# Conflicts:
#	app/assets/javascripts/api.js
#	doc/administration/auth/ldap.md
#	lib/gitlab/auth.rb

[ci skip]