# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml
#	app/views/projects/_home_panel.html.haml

[ci skip]