# Conflicts:
#	app/assets/javascripts/reports/components/issues_list.vue
#	app/assets/javascripts/reports/components/report_issues.vue
#	app/models/project_services/hipchat_service.rb
#	app/serializers/environment_entity.rb
#	app/services/ci/enqueue_build_service.rb
#	app/views/projects/mirrors/_instructions.html.haml
#	app/views/projects/mirrors/_mirror_repos.html.haml
#	app/views/projects/mirrors/_mirror_repos_form.html.haml
#	locale/gitlab.pot

[ci skip]