luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-27 17:14:42 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/statuses
History
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
_og_description.html.haml
_og_image.html.haml
_poll.html.haml
_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
show.html.haml