# Conflicts:
#	app/assets/javascripts/pages/projects/project.js
#	app/assets/stylesheets/framework/variables.scss
#	app/finders/template_finder.rb
#	app/helpers/button_helper.rb
#	app/views/projects/_home_panel.html.haml
#	doc/user/markdown.md
#	locale/gitlab.pot

[ci skip]