# Conflicts:
#	app/assets/javascripts/projects/project_new.js
#	doc/ci/variables/README.md
#	doc/ci/variables/where_variables_can_be_used.md
#	locale/gitlab.pot
#	spec/controllers/admin/application_settings_controller_spec.rb
#	spec/javascripts/lib/utils/text_utility_spec.js

[ci skip]