# Conflicts:
#	app/controllers/projects/wikis_controller.rb
#	app/models/ci/job_artifact.rb
#	app/models/issue.rb
#	app/models/project.rb
#	app/models/project_statistics.rb
#	spec/models/ci/build_spec.rb

[ci skip]