kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rebasing on master

Browse source 
Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
This commit is contained in:
Izaak Alpert 2013-06-26 10:00:21 -04:00
parent c1b05e7b86
commit d1da45e1a3
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/admin/users/show.html.haml
View file

@ -20,12 +20,11 @@
.row
.span6
<<<<<<< HEAD
.ui-box
%h5.title
Account:
.pull-right
= image_tag gravatar_icon(@admin_user.email, 32), class: "avatar s32", alt: ''
= image_tag gravatar_icon(@admin_user.email, 32), class:"avatar s32", alt:""
%ul.well-list
%li
%span.light Name: