# Conflicts:
#	CHANGELOG.md
#	locale/gitlab.pot
#	spec/models/merge_request_spec.rb
#	spec/models/project_wiki_spec.rb
#	spec/models/repository_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]