# Conflicts:
#	app/assets/javascripts/boards/components/issue_card_inner.js
#	app/views/layouts/_page.html.haml
#	app/views/projects/branches/_branch.html.haml
#	config/webpack.config.js

[ci skip]