# Conflicts:
#	app/models/project.rb
#	app/policies/merge_request_policy.rb
#	lib/api/helpers/projects_helpers.rb
#	lib/api/projects.rb
#	lib/gitlab/import_export/import_export.yml

[ci skip]