# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue
#	doc/api/groups.md
#	doc/user/group/index.md
#	spec/models/project_spec.rb

[ci skip]