mastodon/app/views/statuses
Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.
2022-01-23 18:24:01 +01:00
..
_attachment_list.html.haml
_detailed_status.html.haml Add post edited notice in admin and public UIs (#17335) 2022-01-20 13:37:31 +01:00
_og_description.html.haml Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
_og_image.html.haml Fix various issues around OpenGraph representation of media (#14133) 2020-06-25 01:33:01 +02:00
_poll.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
_simple_status.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00
_status.html.haml
embed.html.haml Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
show.html.haml