# Conflicts:
#	app/assets/javascripts/pages/groups/issues/index.js
#	app/views/admin/application_settings/show.html.haml
#	doc/user/project/labels.md

[ci skip]