# Conflicts:
#	app/assets/stylesheets/pages/groups.scss
#	app/models/group.rb
#	config/database.yml.postgresql
#	config/routes/group.rb
#	db/schema.rb
#	doc/api/settings.md
#	locale/gitlab.pot
#	scripts/prepare_build.sh

[ci skip]