Commit d1da45e1 authored by Izaak Alpert's avatar Izaak Alpert

Rebasing on master

Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3
parent c1b05e7b
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment