Merge branch 'master' of http://github.com/diaspora/diaspora into spanish-translation
This commit is contained in:
commit
46c3d83634
1 changed files with 1 additions and 1 deletions
|
|
@ -7,6 +7,6 @@
|
|||
= person_image_tag(post.person)
|
||||
%span.from
|
||||
= link_to post.person.real_name, post.person
|
||||
= auto_link post.text
|
||||
= auto_link sanitize post.text
|
||||
%div.time
|
||||
= "#{time_ago_in_words(post.updated_at)} ago"
|
||||
|
|
|
|||
Loading…
Reference in a new issue