Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/steveyken-patch-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
CloCkWeRX committed Dec 5, 2016
2 parents 2a15af0 + 47b1bbc commit cd39d2d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/views/users/_user.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
= h(@user.company) unless @user.company.blank?
%br
%div
#{t :email}: #{auto_link(@user.email)}
- unless @user.email.blank?
#{t :email}: #{auto_link(@user.email)}
- unless @user.alt_email.blank?
#{t :or} #{auto_link(@user.alt_email)}
- if !@user.phone.blank? && !@user.mobile.blank?
Expand Down

0 comments on commit cd39d2d

Please sign in to comment.