# Conflicts:
#	app/models/group.rb
#	app/models/upload.rb
#	app/services/merge_requests/build_service.rb
#	app/uploaders/attachment_uploader.rb
#	app/uploaders/avatar_uploader.rb
#	app/uploaders/file_uploader.rb
#	app/uploaders/gitlab_uploader.rb
#	app/uploaders/job_artifact_uploader.rb
#	app/uploaders/legacy_artifact_uploader.rb
#	app/uploaders/lfs_object_uploader.rb
#	app/uploaders/namespace_file_uploader.rb
#	app/uploaders/personal_file_uploader.rb
#	config/gitlab.yml.example
#	config/initializers/1_settings.rb
#	spec/controllers/projects/artifacts_controller_spec.rb
#	spec/controllers/projects/raw_controller_spec.rb
#	spec/factories/groups.rb
#	spec/uploaders/attachment_uploader_spec.rb
#	spec/uploaders/avatar_uploader_spec.rb
#	spec/uploaders/file_uploader_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb
#	spec/uploaders/legacy_artifact_uploader_spec.rb
#	spec/uploaders/lfs_object_uploader_spec.rb
#	spec/uploaders/namespace_file_uploader_spec.rb
#	spec/uploaders/personal_file_uploader_spec.rb

[ci skip]