# Conflicts:
#	app/assets/stylesheets/pages/builds.scss
#	app/views/layouts/header/_default.html.haml
#	lib/gitlab/background_migration/redact_links.rb
#	spec/models/ci/build_spec.rb

[ci skip]