# Conflicts:
#   app/assets/stylesheets/framework/nav.scss
#   app/assets/stylesheets/pages/environments.scss
#   app/views/layouts/nav/_group.html.haml
#   app/views/layouts/nav/_project.html.haml