David Yip e77c3996a5 Merge remote-tracking branch 'origin/master' into gs-master

2017-11-27 11:29:04 -06:00

..

_content_spoiler.html.haml

…

_detailed_status.html.haml

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

2017-10-16 09:23:59 -05:00

_media.html.haml

…

_og_description.html.haml

…

_og_image.html.haml

…

_simple_status.html.haml

…

_status.html.haml

…

embed.html.haml

…

show.html.haml

Use account.username when display_name is empty (#5828)

2017-11-27 16:09:52 +01:00