# Conflicts:
#	app/models/group.rb
#	db/schema.rb
#	lib/api/entities.rb
#	spec/serializers/pipeline_serializer_spec.rb

[ci skip]