# Conflicts:
#	app/views/shared/milestones/_sidebar.html.haml
#	config/webpack.config.js

[ci skip]