Merge remote-tracking branch 'origin/master' into gs-master

This commit is contained in:
David Yip 2018-01-20 16:42:57 -06:00
commit d000f5dd80

View file

@ -19,7 +19,7 @@
%tbody %tbody
%tr %tr
%td{ align: 'left', width: 48 } %td{ align: 'left', width: 48 }
= image_tag status.account.avatar = image_tag full_asset_url(status.account.avatar), alt:''
%td{ align: 'left' } %td{ align: 'left' }
%bdi= display_name(status.account) %bdi= display_name(status.account)
= "@#{status.account.acct}" = "@#{status.account.acct}"