# Conflicts:
#	GITALY_SERVER_VERSION
#	app/helpers/namespaces_helper.rb
#	app/views/projects/_new_project_fields.html.haml
#	db/schema.rb
#	doc/user/project/labels.md
#	locale/gitlab.pot

[ci skip]