mastodon/app/views/statuses
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02:00
..
_attachment_list.html.haml
_detailed_status.html.haml Add customizable thumbnails for audio and video attachments (#14145) 2020-06-29 13:56:55 +02:00
_og_description.html.haml
_og_image.html.haml Fix various issues around OpenGraph representation of media (#14133) 2020-06-25 01:33:01 +02:00
_poll.html.haml
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
_status.html.haml
embed.html.haml
show.html.haml