# Conflicts:
#	CHANGELOG.md
#	LICENSE
#	app/assets/javascripts/boards/models/list.js
#	app/models/issue.rb
#	db/schema.rb
#	doc/api/projects.md
#	lib/api/helpers/project_snapshots_helpers.rb
#	spec/lib/gitlab/import_export/safe_model_attributes.yml
#	spec/models/issue_spec.rb

[ci skip]