# Conflicts:
#	app/assets/javascripts/init_legacy_filters.js
#	app/assets/javascripts/milestone_select.js
#	app/models/project_team.rb
#	doc/user/project/quick_actions.md
#	features/steps/shared/project.rb
#	qa/qa/page/menu/admin.rb
#	spec/controllers/projects/imports_controller_spec.rb
#	spec/features/issues/form_spec.rb
#	spec/features/merge_requests/edit_mr_spec.rb
#	spec/lib/gitlab/reference_extractor_spec.rb
#	spec/requests/api/issues_spec.rb
#	spec/services/git_push_service_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]