# Conflicts:
#	app/serializers/project_mirror_entity.rb
#	app/views/projects/settings/repository/show.html.haml
#	locale/gitlab.pot

[ci skip]