# Conflicts:
#	app/finders/license_template_finder.rb
#	app/services/groups/destroy_service.rb
#	app/views/admin/application_settings/show.html.haml
#	doc/administration/index.md
#	doc/user/project/import/index.md
#	doc/user/project/import/manifest.md
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/translate_spec.js

[ci skip]