# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/assets/stylesheets/framework.scss
#	doc/ci/autodeploy/index.md
#	doc/ci/examples/README.md
#	doc/ci/examples/dast.md
#	doc/ci/examples/sast_docker.md
#	doc/install/README.md
#	doc/topics/autodevops/index.md
#	spec/spec_helper.rb

[ci skip]