# HG changeset patch # User Chris Cannam # Date 1315582512 -3600 # Node ID 3c49c63173efa89a1a99f9327e000ec2f9fa0004 # Parent b4e9410882f187408a50da1334eb6578a4cf4a37# Parent 7fc15203288c17d1fe18d74e154f4767107a470b Merge from branch "cannam" diff -r b4e9410882f1 -r 3c49c63173ef app/views/users/show.rhtml --- a/app/views/users/show.rhtml Tue Sep 06 12:24:01 2011 +0100 +++ b/app/views/users/show.rhtml Fri Sep 09 16:35:12 2011 +0100 @@ -24,7 +24,7 @@ <%= textilizable @description %>

<%=l(:label_ssamr_institution)%>

-<%= h @institution_name %> +

<%= h @institution_name %>

<% unless @memberships.empty? %>