mirror of https://github.com/Siphonay/mastodon
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
|---|---|---|
| .. | ||
| _content_spoiler.html.haml | ||
| _detailed_status.html.haml | ||
| _media.html.haml | ||
| _more.html.haml | ||
| _og_description.html.haml | ||
| _og_image.html.haml | ||
| _simple_status.html.haml | ||
| _status.html.haml | ||
| embed.html.haml | ||
| show.html.haml | ||