mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 04:24:26 +00:00
f513317ba2
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns. |
||
|---|---|---|
| .. | ||
| _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 | ||