# Conflicts:
#	.gitlab-ci.yml
#	app/controllers/projects/imports_controller.rb
#	app/workers/stuck_import_jobs_worker.rb
#	lib/gitlab/import_export/import_export.yml
#	locale/gitlab.pot
#	spec/factories/projects.rb
#	spec/models/project_spec.rb

[ci skip]