# Conflicts:
#	app/models/resource_label_event.rb
#	app/services/projects/create_from_template_service.rb
#	app/services/projects/gitlab_projects_import_service.rb
#	app/services/resource_events/change_labels_service.rb
#	db/migrate/20180726172057_create_resource_label_events.rb
#	db/schema.rb
#	doc/administration/index.md
#	doc/api/issues.md
#	locale/gitlab.pot

[ci skip]