Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Sarah Mei 2011-02-02 11:14:36 -08:00
commit 73ea3c60a0

View file

@ -7,7 +7,8 @@
.content
.from
= person_link(comment.person)
= markdownify(comment.text, :youtube_maps => comment.youtube_titles)
.message
= markdownify(comment.text, :youtube_maps => comment.youtube_titles)
.info
%span.time