# Conflicts:
#	app/assets/javascripts/pipelines/pipeline_details_bundle.js
#	config/webpack.config.js

[ci skip]