# Conflicts:
#	db/schema.rb
#	doc/api/issues.md
#	doc/user/group/img/groups.png
#	doc/user/project/img/labels_list.png
#	locale/gitlab.pot

[ci skip]