# Conflicts:
#	app/controllers/projects/issues_controller.rb
#	app/policies/project_policy.rb
#	app/views/admin/projects/show.html.haml
#	spec/policies/project_policy_spec.rb

[ci skip]