app/views/layouts/nav · e1bf40e293409d974a8013685ec544c0f633ef16 · Forest Godfrey / gitlab-ce

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

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

Name	Last commit	Last update
..
_admin.html.haml		Loading commit data...
_admin_settings.html.haml		Loading commit data...
_dashboard.html.haml		Loading commit data...
_explore.html.haml		Loading commit data...
_group.html.haml		Loading commit data...
_group_settings.html.haml		Loading commit data...
_profile.html.haml		Loading commit data...
_project.html.haml		Loading commit data...
_project_settings.html.haml		Loading commit data...