Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
|---|---|---|
| .. | ||
| _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 | ||