Rebasing on master

Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3

Rebasing on master
d1da45e1 · Izaak Alpert · c1b05e7b · d1da45e1
Commit d1da45e1 authored 11 years ago by Izaak Alpert
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -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: