# Conflicts:
#	app/views/projects/settings/repository/show.html.haml
#	app/views/shared/issuable/_sidebar.html.haml
#	config/webpack.config.js

[ci skip]