# Conflicts:
#	app/services/projects/destroy_service.rb
#	db/migrate/20161220141214_remove_dot_git_from_group_names.rb
#	db/schema.rb
#	locale/gitlab.pot
#	spec/factories/projects.rb
#	spec/helpers/projects_helper_spec.rb

[ci skip]