# Conflicts:
#	app/views/projects/new.html.haml
#	doc/user/project/import/index.md
#	locale/gitlab.pot

[ci skip]