diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
| commit | f5e65e2e508269ff7c18318526ba01f8e7d83951 (patch) | |
| tree | dd834b066dc51de87139d69ea042e0bdfd69334d /app/views/users/_profile.html.haml | |
| parent | cc29ce491786d631586c3b0d0da310b8b790a673 (diff) | |
| parent | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (diff) | |
Merge branch 'master' into markdown-tags
Merge updated CHANGELOG entries
Diffstat (limited to 'app/views/users/_profile.html.haml')
| -rw-r--r-- | app/views/users/_profile.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml index 0a70b738071..bca71444956 100644 --- a/app/views/users/_profile.html.haml +++ b/app/views/users/_profile.html.haml @@ -21,7 +21,7 @@ %li %span.light Website: %strong= link_to user.short_website_url, user.full_website_url - - unless user.bio.blank? + - unless user.location.blank? %li - %span.light Bio: - %span= user.bio + %span.light Location: + %strong= user.location |