# Conflicts:
#	app/assets/javascripts/repo/components/repo_tab.vue
#	app/models/application_setting.rb
#	app/models/ci/runner.rb
#	app/services/merge_requests/build_service.rb
#	app/services/projects/hashed_storage/migrate_attachments_service.rb
#	app/services/projects/hashed_storage/migrate_repository_service.rb
#	app/services/projects/update_service.rb
#	db/schema.rb
#	lib/gitlab/gitaly_client.rb
#	spec/services/projects/update_service_spec.rb

[ci skip]