# Conflicts:
#	app/assets/stylesheets/pages/issuable.scss
#	app/models/ci/pipeline_enums.rb
#	app/models/commit_status_enums.rb
#	app/models/user_callout_enums.rb
#	db/schema.rb
#	doc/administration/uploads.md
#	spec/db/schema_spec.rb

[ci skip]