mirror of https://github.com/tootsuite/mastodon
48b8a1f414
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes. |
||
|---|---|---|
| .. | ||
| _attachment_list.html.haml | ||
| _detailed_status.html.haml | ||
| _og_description.html.haml | ||
| _og_image.html.haml | ||
| _poll.html.haml | ||
| _simple_status.html.haml | ||
| _status.html.haml | ||
| embed.html.haml | ||
| show.html.haml | ||