app/views/layouts/nav/_group.html.haml · 8798b1829a2249d6ef68c4121089790a82a1ec64 · Léo-Paul Géneau / gitlab-ce

Merge branch 'master' into 'badge-color-on-white-bg' · 4af64c3e

Dimitrie Hoekstra authored Dec 16, 2016

# 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

4af64c3e

_group.html.haml 1.6 KB

Replace _group.html.haml