Merge branch 'master' of http://github.com/diaspora/diaspora into spanish-translation

This commit is contained in:
Ariel Zavala 2010-09-16 11:46:57 -04:00
commit 46c3d83634

View file

@ -7,6 +7,6 @@
= person_image_tag(post.person) = person_image_tag(post.person)
%span.from %span.from
= link_to post.person.real_name, post.person = link_to post.person.real_name, post.person
= auto_link post.text = auto_link sanitize post.text
%div.time %div.time
= "#{time_ago_in_words(post.updated_at)} ago" = "#{time_ago_in_words(post.updated_at)} ago"