Skip to content
Commit 88a12332 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'sh-resolve-member-presenter-conflicts' into 'master'

Reconcile CE and EE differences in members/_member.html.haml

See merge request gitlab-org/gitlab-ce!29021
parents 57fa8c75 5aa08c69
Loading
Loading
Loading