This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/statuses
Thibaut Girka 2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.
2020-07-05 19:35:56 +02: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 'master' into glitch-soc/merge-upstream 2020-07-05 19:35:56 +02:00
_status.html.haml
embed.html.haml
show.html.haml